Merge "Use bigdia search with pruned subpel search"

diff --combined vp9/encoder/vp9_speed_features.c
index 75d86ce,0dcbb08..889a8be
--- 1/vp9/encoder/vp9_speed_features.c
--- 2/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@@ -13,6 -13,43 +13,6 @@@
  #include "vp9/encoder/vp9_encoder.h"
  #include "vp9/encoder/vp9_speed_features.h"
  
 -enum {
 -  INTRA_ALL       = (1 << DC_PRED) |
 -                    (1 << V_PRED) | (1 << H_PRED) |
 -                    (1 << D45_PRED) | (1 << D135_PRED) |
 -                    (1 << D117_PRED) | (1 << D153_PRED) |
 -                    (1 << D207_PRED) | (1 << D63_PRED) |
 -                    (1 << TM_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 = (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) |
 -                              (1 << THR_ALTR) |
 -                              (1 << THR_GOLD) |
 -                              (1 << THR_LAST),
 -
 -  DISABLE_ALL_SPLIT         = (1 << THR_INTRA) | DISABLE_ALL_INTER_SPLIT,
 -
 -  DISABLE_COMPOUND_SPLIT    = (1 << THR_COMP_GA) | (1 << THR_COMP_LA),
 -
 -  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 int frame_is_boosted(const VP9_COMP *cpi) {
@@@ -123,6 -160,8 +123,8 @@@ static void set_good_speed_feature(VP9_
      sf->use_square_partition_only = 1;
      sf->tx_size_search_method = USE_LARGESTALL;
      sf->disable_split_mask = DISABLE_ALL_SPLIT;
+     sf->mv.search_method = BIGDIA;
+     sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED;
      sf->adaptive_rd_thresh = 4;
      sf->mode_search_skip_flags |= FLAG_SKIP_COMP_REFMISMATCH |
                                    FLAG_EARLY_TERMINATE;