Merge "Replacing magic constants with expressions."

diff --cc vp9/encoder/vp9_speed_features.c
index 0d9007b94b6c62ff29b09efda3a42566ee11ffd3,2dc2258af5a8709da319d5767bf5b39595317c30..32d495c0d83bdf6ff98bf42683c266f18a39a059
--- 1/vp9/encoder/vp9_speed_features.c
--- 2/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@@ -20,11 -25,28 +25,21 @@@
  #define INTRA_DC_TM_H_V (INTRA_DC_TM | (1 << V_PRED) | (1 << H_PRED))
  
  // Masks for partially or completely disabling split mode
- #define DISABLE_ALL_SPLIT         0x3F
- #define DISABLE_ALL_INTER_SPLIT   0x1F
- #define DISABLE_COMPOUND_SPLIT    0x18
- #define LAST_AND_INTRA_SPLIT_ONLY 0x1E
+ #define DISABLE_ALL_INTER_SPLIT   ((1 << THR_COMP_GA) | \
+                                    (1 << THR_COMP_LA) | \
+                                    (1 << THR_ALTR) | \
+                                    (1 << THR_GOLD) | \
+                                    (1 << THR_LAST))
+ 
+ #define DISABLE_ALL_SPLIT         ((1 << THR_INTRA) | DISABLE_ALL_INTER_SPLIT)
+ 
+ #define DISABLE_COMPOUND_SPLIT    ((1 << THR_COMP_GA) | (1 << THR_COMP_LA))
+ 
+ #define LAST_AND_INTRA_SPLIT_ONLY ((1 << THR_COMP_GA) | \
+                                    (1 << THR_COMP_LA) | \
+                                    (1 << THR_ALTR) | \
+                                    (1 << THR_GOLD))
  
 -// Intra only frames, golden frames (except alt ref overlays) and
 -// alt ref frames tend to be coded at a higher than ambient quality
 -static INLINE int frame_is_boosted(const VP9_COMP *cpi) {
 -  return frame_is_intra_only(&cpi->common) || cpi->refresh_alt_ref_frame ||
 -         (cpi->refresh_golden_frame && !cpi->rc.is_src_frame_alt_ref);
 -}
 -
  static void set_good_speed_feature(VP9_COMP *cpi,
                                     VP9_COMMON *cm,
                                     SPEED_FEATURES *sf,