Merge "Chessboard pattern prediction filter type search in non-RD coding"

diff --cc vp9/encoder/vp9_pickmode.c
index 7a9260afea06b98b05749b8be5b347ddfc894066,699e70784c57a744617c1efb13befe65dc0e0b7a..c1493e7194cc6409e2adfd4bd08746d5b82c72d2
--- 1/vp9/encoder/vp9_pickmode.c
--- 2/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@@ -235,9 -235,12 +235,12 @@@ int64_t vp9_pick_inter_mode(VP9_COMP *c
    unsigned char segment_id = mbmi->segment_id;
    const int *const rd_threshes = cpi->rd.threshes[segment_id][bsize];
    const int *const rd_thresh_freq_fact = cpi->rd.thresh_freq_fact[bsize];
 -  // Mode index conversion form THR_MODES to MB_PREDICTION_MODE for a ref frame.
 +  // Mode index conversion form THR_MODES to PREDICTION_MODE for a ref frame.
    int mode_idx[MB_MODE_COUNT] = {0};
    INTERP_FILTER filter_ref = SWITCHABLE;
+   int bsl = mi_width_log2_lookup[bsize];
+   int pred_filter_search = (((mi_row + mi_col) >> bsl) +
+                             cpi->sf.chessboard_index) & 0x01;
  
    x->skip_encode = cpi->sf.skip_encode_frame && x->q_index < QIDX_SKIP_THRESH;
  

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