shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "twopass_encoder: Add frame limit argument."

--- a/examples/twopass_encoder.c

+++ b/examples/twopass_encoder.c

@@ -59,7 +59,9 @@

 static const char *exec_name;

 void usage_exit(void) {

-  fprintf(stderr, "Usage: %s <codec> <width> <height> <infile> <outfile>\n",

+  fprintf(stderr,

+          "Usage: %s <codec> <width> <height> <infile> <outfile> "

+              "<frame limit>\n",

           exec_name);

   exit(EXIT_FAILURE);

 }

@@ -129,7 +131,8 @@

 static vpx_fixed_buf_t pass0(vpx_image_t *raw,

                              FILE *infile,

                              const VpxInterface *encoder,

-                             const vpx_codec_enc_cfg_t *cfg) {

+                             const vpx_codec_enc_cfg_t *cfg,

+                             int max_frames) {

   vpx_codec_ctx_t codec;

   int frame_count = 0;

   vpx_fixed_buf_t stats = {NULL, 0};

@@ -142,6 +145,8 @@

     ++frame_count;

     get_frame_stats(&codec, raw, frame_count, 1, 0, VPX_DL_GOOD_QUALITY,

                     &stats);

+    if (max_frames > 0 && frame_count >= max_frames)

+      break;

   }

   // Flush encoder.

@@ -159,7 +164,8 @@

                   FILE *infile,

                   const char *outfile_name,

                   const VpxInterface *encoder,

-                  const vpx_codec_enc_cfg_t *cfg) {

+                  const vpx_codec_enc_cfg_t *cfg,

+                  int max_frames) {

   VpxVideoInfo info = {

     encoder->fourcc,

     cfg->g_w,

@@ -181,6 +187,9 @@

   while (vpx_img_read(raw, infile)) {

     ++frame_count;

     encode_frame(&codec, raw, frame_count, 1, 0, VPX_DL_GOOD_QUALITY, writer);

+

+    if (max_frames > 0 && frame_count >= max_frames)

+      break;

   }

   // Flush encoder.

@@ -213,11 +222,14 @@

   const char *const height_arg = argv[3];

   const char *const infile_arg = argv[4];

   const char *const outfile_arg = argv[5];

+  int max_frames = 0;

   exec_name = argv[0];

-  if (argc != 6)

+  if (argc != 7)

     die("Invalid number of arguments.");

+  max_frames = strtol(argv[6], NULL, 0);

+

   encoder = get_vpx_encoder_by_name(codec_arg);

   if (!encoder)

     die("Unsupported codec.");

@@ -249,13 +261,13 @@

   // Pass 0

   cfg.g_pass = VPX_RC_FIRST_PASS;

-  stats = pass0(&raw, infile, encoder, &cfg);

+  stats = pass0(&raw, infile, encoder, &cfg, max_frames);

   // Pass 1

   rewind(infile);

   cfg.g_pass = VPX_RC_LAST_PASS;

   cfg.rc_twopass_stats_in = stats;

-  pass1(&raw, infile, outfile_arg, encoder, &cfg);

+  pass1(&raw, infile, outfile_arg, encoder, &cfg, max_frames);

   free(stats.buf);

   vpx_img_free(&raw);

--- a/test/twopass_encoder.sh

+++ b/test/twopass_encoder.sh

@@ -23,7 +23,8 @@

   fi

 }

-# Runs twopass_encoder using the codec specified by $1.

+# Runs twopass_encoder using the codec specified by $1 with a frame limit of

+# 100.

 twopass_encoder() {

   local encoder="${LIBVPX_BIN_PATH}/twopass_encoder${VPX_TEST_EXE_SUFFIX}"

   local codec="$1"

@@ -35,7 +36,7 @@

   fi

   eval "${VPX_TEST_PREFIX}" "${encoder}" "${codec}" "${YUV_RAW_INPUT_WIDTH}" \

-      "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" \

+      "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" 100 \

       ${devnull}

   [ -e "${output_file}" ] || return 1

@@ -47,10 +48,7 @@

   fi

 }

-# TODO(tomfinegan): Add a frame limit param to twopass_encoder and enable this

-# test. VP9 is just too slow right now: This test takes 31m16s+ on a fast

-# machine.

-DISABLED_twopass_encoder_vp9() {

+twopass_encoder_vp9() {

   if [ "$(vp9_encode_available)" = "yes" ]; then

     twopass_encoder vp9 || return 1

   fi

@@ -57,6 +55,6 @@

 }

 twopass_encoder_tests="twopass_encoder_vp8

-                       DISABLED_twopass_encoder_vp9"

+                       twopass_encoder_vp9"

 run_tests twopass_encoder_verify_environment "${twopass_encoder_tests}"