Merge "vp9: Adjust speed features for speed 8 at low resoln."

diff --cc vp9/encoder/vp9_speed_features.c
index 24c15d4b5028ccdd030ee666a83b61e42911ebf0,54a90c77b0469762cc5be8e60c6c64052801e0df..0884b8405cf00a9ddc5a1317f00a8cf5fe540c07
--- 1/vp9/encoder/vp9_speed_features.c
--- 2/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@@ -602,8 -565,13 +606,8 @@@ static void set_rt_speed_feature_frames
          sf->adaptive_rd_thresh = 2;
      }
      sf->limit_newmv_early_exit = 0;
-     if (cm->width > 320 && cm->height > 240) sf->use_simple_block_yrd = 1;
+     sf->use_simple_block_yrd = 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;
 -  }
  }
  
  void vp9_set_speed_features_framesize_dependent(VP9_COMP *cpi) {