disable speed > 1 speed corrections in firstpass
authorJim Bankoski <jimbankoski@google.com>
Thu, 20 Jun 2013 16:28:11 +0000 (09:28 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 20 Jun 2013 16:34:03 +0000 (09:34 -0700)
need to rework these

Change-Id: I17dc2c88d2faadd2f8fb117c52c25f04ea2e9856

vp9/encoder/vp9_firstpass.c

index 5e26cd8..522f899 100644 (file)
@@ -986,9 +986,11 @@ static int estimate_max_q(VP9_COMP *cpi,
 
   // Corrections for higher compression speed settings
   // (reduced compression expected)
+  // FIXME(jimbankoski): Once we settle on vp9 speed features we need to
+  // change this code.
   if (cpi->compressor_speed == 1)
     speed_correction = cpi->oxcf.cpu_used <= 5 ?
-                          1.04 + (cpi->oxcf.cpu_used * 0.04) :
+                          1.04 + (/*cpi->oxcf.cpu_used*/0 * 0.04) :
                           1.25;
 
   // Try and pick a max Q that will be high enough to encode the
@@ -1051,7 +1053,7 @@ static int estimate_cq(VP9_COMP *cpi,
   // (reduced compression expected)
   if (cpi->compressor_speed == 1) {
     if (cpi->oxcf.cpu_used <= 5)
-      speed_correction = 1.04 + (cpi->oxcf.cpu_used * 0.04);
+      speed_correction = 1.04 + (/*cpi->oxcf.cpu_used*/ 0 * 0.04);
     else
       speed_correction = 1.25;
   }