ref: 87a3129e5208bc70572d5e3856c16753b1d7a87d
parent: fe49c05214fb3cf3198a3321eb574f94c082b098
parent: 98e16b1b3dccb8964e1fa4958c11a24d35b65faa
author: James Zern <[email protected]>
date: Thu Mar 6 06:42:19 EST 2014
Merge "move resize_util.c to examples/"
--- a/examples.mk
+++ b/examples.mk
@@ -66,7 +66,7 @@
vp9_spatial_scalable_encoder.DESCRIPTION = Spatial Scalable Encoder
ifeq ($(CONFIG_SHARED),no)
-UTILS-$(CONFIG_VP9_ENCODER) += resize_util.c
+EXAMPLES-$(CONFIG_VP9_ENCODER) += resize_util.c
endif
# XMA example disabled for now, not used in VP8
--- /dev/null
+++ b/examples/resize_util.c
@@ -1,0 +1,120 @@
+/*
+ * Copyright (c) 2014 The WebM project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <assert.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "./vp9/encoder/vp9_resize.h"
+
+static void usage(char *progname) {+ printf("Usage:\n");+ printf("%s <input_yuv> <width>x<height> <target_width>x<target_height> ",+ progname);
+ printf("<output_yuv> [<frames>]\n");+}
+
+static int parse_dim(char *v, int *width, int *height) {+ char *x = strchr(v, 'x');
+ if (x == NULL)
+ x = strchr(v, 'X');
+ if (x == NULL)
+ return 0;
+ *width = atoi(v);
+ *height = atoi(&x[1]);
+ if (*width <= 0 || *height <= 0)
+ return 0;
+ else
+ return 1;
+}
+
+int main(int argc, char *argv[]) {+ char *fin, *fout;
+ FILE *fpin, *fpout;
+ uint8_t *inbuf, *outbuf;
+ uint8_t *inbuf_u, *outbuf_u;
+ uint8_t *inbuf_v, *outbuf_v;
+ int f, frames;
+ int width, height, target_width, target_height;
+
+ if (argc < 5) {+ printf("Incorrect parameters:\n");+ usage(argv[0]);
+ return 1;
+ }
+
+ fin = argv[1];
+ fout = argv[4];
+ if (!parse_dim(argv[2], &width, &height)) {+ printf("Incorrect parameters: %s\n", argv[2]);+ usage(argv[0]);
+ return 1;
+ }
+ if (!parse_dim(argv[3], &target_width, &target_height)) {+ printf("Incorrect parameters: %s\n", argv[3]);+ usage(argv[0]);
+ return 1;
+ }
+
+ fpin = fopen(fin, "rb");
+ if (fpin == NULL) {+ printf("Can't open file %s to read\n", fin);+ usage(argv[0]);
+ return 1;
+ }
+ fpout = fopen(fout, "wb");
+ if (fpout == NULL) {+ printf("Can't open file %s to write\n", fout);+ usage(argv[0]);
+ return 1;
+ }
+ if (argc >= 6)
+ frames = atoi(argv[5]);
+ else
+ frames = INT_MAX;
+
+ printf("Input size: %dx%d\n",+ width, height);
+ printf("Target size: %dx%d, Frames: ",+ target_width, target_height);
+ if (frames == INT_MAX)
+ printf("All\n");+ else
+ printf("%d\n", frames);+
+ inbuf = (uint8_t*)malloc(width * height * 3 / 2);
+ outbuf = (uint8_t*)malloc(target_width * target_height * 3 / 2);
+ inbuf_u = inbuf + width * height;
+ inbuf_v = inbuf_u + width * height / 4;
+ outbuf_u = outbuf + target_width * target_height;
+ outbuf_v = outbuf_u + target_width * target_height / 4;
+ f = 0;
+ while (f < frames) {+ if (fread(inbuf, width * height * 3 / 2, 1, fpin) != 1)
+ break;
+ vp9_resize_frame420(inbuf, width, inbuf_u, inbuf_v, width / 2,
+ height, width,
+ outbuf, target_width, outbuf_u, outbuf_v,
+ target_width / 2,
+ target_height, target_width);
+ fwrite(outbuf, target_width * target_height * 3 / 2, 1, fpout);
+ f++;
+ }
+ printf("%d frames processed\n", f);+ fclose(fpin);
+ fclose(fpout);
+
+ free(inbuf);
+ free(outbuf);
+ return 0;
+}
--- a/resize_util.c
+++ /dev/null
@@ -1,120 +1,0 @@
-/*
- * Copyright (c) 2014 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <assert.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "./vp9/encoder/vp9_resize.h"
-
-static void usage(char *progname) {- printf("Usage:\n");- printf("%s <input_yuv> <width>x<height> <target_width>x<target_height> ",- progname);
- printf("<output_yuv> [<frames>]\n");-}
-
-static int parse_dim(char *v, int *width, int *height) {- char *x = strchr(v, 'x');
- if (x == NULL)
- x = strchr(v, 'X');
- if (x == NULL)
- return 0;
- *width = atoi(v);
- *height = atoi(&x[1]);
- if (*width <= 0 || *height <= 0)
- return 0;
- else
- return 1;
-}
-
-int main(int argc, char *argv[]) {- char *fin, *fout;
- FILE *fpin, *fpout;
- uint8_t *inbuf, *outbuf;
- uint8_t *inbuf_u, *outbuf_u;
- uint8_t *inbuf_v, *outbuf_v;
- int f, frames;
- int width, height, target_width, target_height;
-
- if (argc < 5) {- printf("Incorrect parameters:\n");- usage(argv[0]);
- return 1;
- }
-
- fin = argv[1];
- fout = argv[4];
- if (!parse_dim(argv[2], &width, &height)) {- printf("Incorrect parameters: %s\n", argv[2]);- usage(argv[0]);
- return 1;
- }
- if (!parse_dim(argv[3], &target_width, &target_height)) {- printf("Incorrect parameters: %s\n", argv[3]);- usage(argv[0]);
- return 1;
- }
-
- fpin = fopen(fin, "rb");
- if (fpin == NULL) {- printf("Can't open file %s to read\n", fin);- usage(argv[0]);
- return 1;
- }
- fpout = fopen(fout, "wb");
- if (fpout == NULL) {- printf("Can't open file %s to write\n", fout);- usage(argv[0]);
- return 1;
- }
- if (argc >= 6)
- frames = atoi(argv[5]);
- else
- frames = INT_MAX;
-
- printf("Input size: %dx%d\n",- width, height);
- printf("Target size: %dx%d, Frames: ",- target_width, target_height);
- if (frames == INT_MAX)
- printf("All\n");- else
- printf("%d\n", frames);-
- inbuf = (uint8_t*)malloc(width * height * 3 / 2);
- outbuf = (uint8_t*)malloc(target_width * target_height * 3 / 2);
- inbuf_u = inbuf + width * height;
- inbuf_v = inbuf_u + width * height / 4;
- outbuf_u = outbuf + target_width * target_height;
- outbuf_v = outbuf_u + target_width * target_height / 4;
- f = 0;
- while (f < frames) {- if (fread(inbuf, width * height * 3 / 2, 1, fpin) != 1)
- break;
- vp9_resize_frame420(inbuf, width, inbuf_u, inbuf_v, width / 2,
- height, width,
- outbuf, target_width, outbuf_u, outbuf_v,
- target_width / 2,
- target_height, target_width);
- fwrite(outbuf, target_width * target_height * 3 / 2, 1, fpout);
- f++;
- }
- printf("%d frames processed\n", f);- fclose(fpin);
- fclose(fpout);
-
- free(inbuf);
- free(outbuf);
- return 0;
-}