From: Jingning Han <jingning@google.com>
Date: Wed, 2 Apr 2014 19:47:50 +0000 (-0700)
Subject: Merge "Adjust rate allocation in non-RD coding mode"
X-Git-Tag: v1.4.0~1919
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=409f48ec520acb6751c8085d54b465c5b3da4ddd;p=libvpx

Merge "Adjust rate allocation in non-RD coding mode"
---

409f48ec520acb6751c8085d54b465c5b3da4ddd
diff --cc vp9/encoder/vp9_ratectrl.c
index b798d6c95,e39c18cd6..2ed0fc7f2
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@@ -977,13 -977,16 +977,13 @@@ int vp9_rc_pick_q_and_bounds(const VP9_
      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)
-       q -= 10;
+     if (cpi->sf.force_ref_frame == 1)
+       q -= 15;
  
      if (q < *bottom_index)
        *bottom_index = q;