From: Marco Paniconi <marpan@google.com>
Date: Wed, 2 Apr 2014 00:50:14 +0000 (-0700)
Subject: Remove the q division by 3 for first frame.
X-Git-Tag: v1.4.0~1928^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=939f0e7444374fbd4aca2f11b47ae48fde930562;p=libvpx

Remove the q division by 3 for first frame.

This code/setting was actually not used (since speed features were not set on first frame,
until a recent change) and should be removed.

In CBR mode, the q value for the first frame can be controlled by setting
the target size via the parameters rc_buf_initial_sz (and max_intra_size_pct).

Change-Id: I65afc64972b36c449bd5a8c25800e65da5389066
---

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 3c8baad79..78cf29e86 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -977,12 +977,9 @@ int vp9_rc_pick_q_and_bounds(const VP9_COMP *cpi,
     q = rc_pick_q_and_bounds_two_pass(cpi, bottom_index, top_index);
   }
 
-  // JBB : This is realtime mode.  In real time mode the first frame
-  // should be larger. Q of 0 is disabled because we force tx size to be
+  // Q of 0 is disabled because we force tx size to be
   // 16x16...
   if (cpi->sf.use_nonrd_pick_mode) {
-    if (cpi->common.current_video_frame == 0)
-      q /= 3;
     if (q == 0)
       q++;
     if (cpi->sf.partition_check == 1)