Merge "Re-design quantization process"

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

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

diff --cc vp9/encoder/vp9_speed_features.c
index 811187057aae5998f756d52238e70df61d451d71,be68bebf58d241baea297744f1062c5aaf7ee986..f25091b06ebdcad3f59d2c2487d44c0f30a93982
--- 1/vp9/encoder/vp9_speed_features.c
--- 2/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@@ -277,11 -277,9 +277,12 @@@ static void set_rt_speed_feature(VP9_CO
  
      // This feature is only enabled when partition search is disabled.
      sf->reuse_inter_pred_sby = 1;
 +
 +    // Increase mode checking threshold for NEWMV.
 +    sf->elevate_newmv_thresh = 2000;
    }
    if (speed >= 7) {
+     sf->use_quant_fp = cm->frame_type == KEY_FRAME ? 0 : 1;
      sf->lpf_pick = LPF_PICK_MINIMAL_LPF;
      sf->encode_breakout_thresh = (MIN(cm->width, cm->height) >= 720) ?
          800 : 300;

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