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 4c3d34d50896b08ff6270e7ad19056fb1137a3f7,6155935878fc27239709d2841259c380aa13c98c..15b98619731fe0fbe53e4f46b6be7d5a8eb7bdb5
--- 1/vp9/encoder/vp9_speed_features.c
--- 2/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@@ -20,13 -20,22 +20,19 @@@ enum 
                      (1 << D117_PRED) | (1 << D153_PRED) |
                      (1 << D207_PRED) | (1 << D63_PRED) |
                      (1 << TM_PRED),
 -
 -  INTRA_DC_ONLY   = (1 << DC_PRED),
 -
 -  INTRA_DC_TM     = (1 << TM_PRED) | (1 << DC_PRED),
 -
 +  INTRA_DC        = (1 << DC_PRED),
 +  INTRA_DC_TM     = (1 << DC_PRED) | (1 << TM_PRED),
    INTRA_DC_H_V    = (1 << DC_PRED) | (1 << V_PRED) | (1 << H_PRED),
 -
 -  INTRA_DC_TM_H_V = INTRA_DC_TM | (1 << V_PRED) | (1 << H_PRED)
 +  INTRA_DC_TM_H_V = (1 << DC_PRED) | (1 << TM_PRED) | (1 << V_PRED) |
 +                    (1 << H_PRED)
  };
  
+ enum {
+   INTER_ALL = (1 << NEARESTMV) | (1 << NEARMV) | (1 << ZEROMV) | (1 << NEWMV),
+   INTER_NEAREST = (1 << NEARESTMV),
+   INTER_NEAREST_NEAR_NEW = (1 << NEARESTMV) | (1 << NEARMV) | (1 << NEWMV)
+ };
+ 
  enum {
    DISABLE_ALL_INTER_SPLIT   = (1 << THR_COMP_GA) |
                                (1 << THR_COMP_LA) |
@@@ -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;
    }