Merge "vp9: Adjust some speed settings for speed 8."

diff --cc vp9/encoder/vp9_speed_features.c
index a3efc1e6aaae688254c3f86484cc52349e445f59,777543368a5d0b527f3f9faf8debfc264b3810c5..01c0ad62c3b2932f10274af79ed302a6dc6198e6
--- 1/vp9/encoder/vp9_speed_features.c
--- 2/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@@ -577,15 -573,16 +577,15 @@@ static void set_rt_speed_feature_frames
        }
        // Since the short_circuit_low_temp_var is used, reduce the
        // adaptive_rd_thresh level.
-       sf->adaptive_rd_thresh = 2;
+       sf->adaptive_rd_thresh = 1;
      }
      sf->limit_newmv_early_exit = 0;
-     if (cm->width > 640 && cm->height > 480) sf->use_simple_block_yrd = 1;
+     if (cm->width > 320 && cm->height > 240) sf->use_simple_block_yrd = 1;
    }
 -  // Turn off adaptive_rd_thresh if row_mt is on for all the non-rd paths. This
 -  // causes too many locks in realtime mode in certain platforms (Android ARM,
 -  // Mac).
 -  if (speed >= 5 && cpi->row_mt && cpi->num_workers > 1) {
 +  // Turn off adaptive_rd_thresh if row_mt is on for speed 5, 6, 7.
 +  if (speed >= 5 && speed < 8 && cpi->row_mt && cpi->num_workers > 1) {
      sf->adaptive_rd_thresh = 0;
 +    sf->adaptive_rd_thresh_row_mt = 0;
    }
  }