commit 561d0af0e39037fdebc2487214d790978ad7f0b4
author Alex Converse <aconverse@google.com> Thu Mar 23 12:58:04 2017 -0700
committer Alex Converse <aconverse@google.com> Thu Mar 23 20:59:58 2017 +0000
tree 2176f309eeba88dba89d02751bd98a5a289843d0
parent 097fef9fc7e985babb629e6f8a223da20231f7a3

Drop the CPUUSED symmetry around zero.

Change-Id: Ifda6ddec1e0c9aff29d531c5bf6411c0072c7b0e

aom/aomcx.h

diff --git a/aom/aomcx.h b/aom/aomcx.h
index d3a61a1..9896854 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -137,7 +137,7 @@
    * of motion estimation methods. Values greater than 0 will increase encoder
    * speed at the expense of quality.
    *
-   * \note Valid range: -8..8
+   * \note Valid range: 0..8
    */
   AOME_SET_CPUUSED = 13,
 

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index b109faf..fc1616e 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -248,7 +248,7 @@
 #if CONFIG_EXT_REFS
   RANGE_CHECK_HI(extra_cfg, enable_auto_bwd_ref, 2);
 #endif  // CONFIG_EXT_REFS
-  RANGE_CHECK(extra_cfg, cpu_used, -8, 8);
+  RANGE_CHECK(extra_cfg, cpu_used, 0, 8);
   RANGE_CHECK_HI(extra_cfg, noise_sensitivity, 6);
   RANGE_CHECK(extra_cfg, superblock_size, AOM_SUPERBLOCK_SIZE_64X64,
               AOM_SUPERBLOCK_SIZE_DYNAMIC);
@@ -477,7 +477,7 @@
 
   oxcf->key_freq = cfg->kf_max_dist;
 
-  oxcf->speed = abs(extra_cfg->cpu_used);
+  oxcf->speed = extra_cfg->cpu_used;
   oxcf->enable_auto_arf = extra_cfg->enable_auto_alt_ref;
 #if CONFIG_EXT_REFS
   oxcf->enable_auto_brf = extra_cfg->enable_auto_bwd_ref;