shithub: libvpx

Info  •  Files  •  Log  •  Branches

Corrected value range of --cpu-used for vp9

This commit removes undefined value options of cpu-used for VP9 and
changed vpxenc prompt to reflect the usable range of [-8,8]

Change-Id: Ib80fef3dbb6ec9aabac45ed13e8ab6fbaf94f55e

--- a/vp9/encoder/vp9_speed_features.c

+++ b/vp9/encoder/vp9_speed_features.c

@@ -339,17 +339,9 @@

     sf->mv.fullpel_search_step_param = 10;

     sf->lpf_pick = LPF_PICK_MINIMAL_LPF;

   }

-

-  if (speed >= 12) {

+  if (speed >= 8) {

     sf->adaptive_rd_thresh = 4;

     sf->mv.subpel_force_stop = 2;

-  }

-

-  if (speed >= 13) {

-    int i;

-    sf->max_intra_bsize = BLOCK_32X32;

-    for (i = 0; i < BLOCK_SIZES; ++i)

-      sf->inter_mode_mask[i] = INTER_NEAREST;

   }

 }

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -208,7 +208,7 @@

           "or kf_max_dist instead.");

   RANGE_CHECK(extra_cfg, enable_auto_alt_ref, 0, 2);

-  RANGE_CHECK(extra_cfg, cpu_used, -16, 16);

+  RANGE_CHECK(extra_cfg, cpu_used, -8, 8);

   RANGE_CHECK_HI(extra_cfg, noise_sensitivity, 6);

   RANGE_CHECK(extra_cfg, tile_columns, 0, 6);

   RANGE_CHECK(extra_cfg, tile_rows, 0, 2);

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -328,8 +328,10 @@

     NULL, "sharpness", 1, "Loop filter sharpness (0..7)");

 static const arg_def_t static_thresh = ARG_DEF(

     NULL, "static-thresh", 1, "Motion detection threshold");

-static const arg_def_t cpu_used = ARG_DEF(

+static const arg_def_t cpu_used_vp8 = ARG_DEF(

     NULL, "cpu-used", 1, "CPU Used (-16..16)");

+static const arg_def_t cpu_used_vp9 = ARG_DEF(

+    NULL, "cpu-used", 1, "CPU Used (-8..8)");

 static const arg_def_t auto_altref = ARG_DEF(

     NULL, "auto-alt-ref", 1, "Enable automatic alt reference frames");

 static const arg_def_t arnr_maxframes = ARG_DEF(

@@ -361,7 +363,7 @@

 static const arg_def_t token_parts = ARG_DEF(

     NULL, "token-parts", 1, "Number of token partitions to use, log2");

 static const arg_def_t *vp8_args[] = {

-  &cpu_used, &auto_altref, &noise_sens, &sharpness, &static_thresh,

+  &cpu_used_vp8, &auto_altref, &noise_sens, &sharpness, &static_thresh,

   &token_parts, &arnr_maxframes, &arnr_strength, &arnr_type,

   &tune_ssim, &cq_level, &max_intra_rate_pct, &screen_content_mode,

   NULL

@@ -420,7 +422,7 @@

     NULL, "tune-content", 1, "Tune content type", tune_content_enum);

 static const arg_def_t *vp9_args[] = {

-  &cpu_used, &auto_altref, &sharpness, &static_thresh,

+  &cpu_used_vp9, &auto_altref, &sharpness, &static_thresh,

   &tile_cols, &tile_rows, &arnr_maxframes, &arnr_strength, &arnr_type,

   &tune_ssim, &cq_level, &max_intra_rate_pct, &max_inter_rate_pct,

   &gf_cbr_boost_pct, &lossless,