Merge "Modify non-rd intra mode checking"

vp9/encoder/vp9_pickmode.c

@@ -469,7 +469,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
   // Perform intra prediction search, if the best SAD is above a certain
   // threshold.
   if (!x->skip && best_rd > inter_mode_thresh &&
-      bsize < cpi->sf.max_intra_bsize) {
+      bsize <= cpi->sf.max_intra_bsize) {
     for (this_mode = DC_PRED; this_mode <= DC_PRED; ++this_mode) {
       vp9_predict_intra_block(xd, 0, b_width_log2(bsize),
                               mbmi->tx_size, this_mode,

vp9/encoder/vp9_speed_features.c

@@ -270,6 +270,10 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
     sf->source_var_thresh = 360;
 
     sf->tx_size_search_method = USE_TX_8X8;
+    // TODO(yunqingwang): max_intra_bsize is used to decide if DC_PRED mode
+    // is checked for a partition block. Later, we can try to allow large
+    // partitions to do intra mode checking.
+    sf->max_intra_bsize = BLOCK_8X8;
   }
 
   if (speed >= 7) {