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

diff --cc vp9/encoder/vp9_ratectrl.c
index b798d6c,e39c18c..2ed0fc7
--- 1/vp9/encoder/vp9_ratectrl.c
--- 2/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;

diff --cc vp9/encoder/vp9_speed_features.c
Simple merge

diff --cc vp9/encoder/vp9_speed_features.h
Simple merge