Merge "Converting disable_inter_mode_mask to inter_mode_mask."

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

diff --cc vp9/encoder/vp9_speed_features.c
index 4c3d34d,6155935..15b9861
--- 1/vp9/encoder/vp9_speed_features.c
--- 2/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@@ -229,15 -238,15 +235,15 @@@ static void set_rt_speed_feature(VP9_CO
      sf->subpel_force_stop = 1;
      for (i = 0; i < TX_SIZES; i++) {
        sf->intra_y_mode_mask[i] = INTRA_DC_H_V;
 -      sf->intra_uv_mode_mask[i] = INTRA_DC_ONLY;
 +      sf->intra_uv_mode_mask[i] = INTRA_DC;
      }
 -    sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_ONLY;
 +    sf->intra_y_mode_mask[TX_32X32] = INTRA_DC;
      sf->frame_parameter_update = 0;
      sf->search_method = FAST_HEX;
-     sf->disable_inter_mode_mask[BLOCK_32X32] = 1 << INTER_OFFSET(ZEROMV);
-     sf->disable_inter_mode_mask[BLOCK_32X64] = ~(1 << INTER_OFFSET(NEARESTMV));
-     sf->disable_inter_mode_mask[BLOCK_64X32] = ~(1 << INTER_OFFSET(NEARESTMV));
-     sf->disable_inter_mode_mask[BLOCK_64X64] = ~(1 << INTER_OFFSET(NEARESTMV));
+     sf->inter_mode_mask[BLOCK_32X32] = INTER_NEAREST_NEAR_NEW;
+     sf->inter_mode_mask[BLOCK_32X64] = INTER_NEAREST;
+     sf->inter_mode_mask[BLOCK_64X32] = INTER_NEAREST;
+     sf->inter_mode_mask[BLOCK_64X64] = INTER_NEAREST;
      sf->max_intra_bsize = BLOCK_32X32;
      sf->allow_skip_recode = 1;
    }