From: Jim Bankoski <jimbankoski@google.com>
Date: Thu, 20 Jun 2013 16:28:11 +0000 (-0700)
Subject: disable speed > 1 speed corrections in firstpass
X-Git-Tag: v1.3.0~1069
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f954490bbf24af9431f9c24744aef1476e11acef;p=libvpx

disable speed > 1 speed corrections in firstpass

need to rework these

Change-Id: I17dc2c88d2faadd2f8fb117c52c25f04ea2e9856
---

diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index 5e26cd82a..522f89982 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -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;
   }