Merge "Rate control parameter adjustment"

diff --cc vp9/encoder/vp9_ratectrl.c
index a8ef1c7918b11f4fb41ca9a18d2bb7271822be02,9c18af1f78b710f608105fa1e72dce49b882d51c..224d1e4f3194563eaa4ff63e9eea9ce37bd7717f
--- 1/vp9/encoder/vp9_ratectrl.c
--- 2/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@@ -59,8 -59,9 +59,8 @@@ static int kfboost_qadjust(int qindex) 
  
  int vp9_bits_per_mb(FRAME_TYPE frame_type, int qindex,
                      double correction_factor) {
 -
    const double q = vp9_convert_qindex_to_q(qindex);
-   int enumerator = frame_type == KEY_FRAME ? 4000000 : 2500000;
+   int enumerator = frame_type == KEY_FRAME ? 3300000 : 2250000;
  
    // q based adjustment to baseline enumerator
    enumerator += (int)(enumerator * q) >> 12;