Merge "Use bigdia search with pruned subpel search"

2014-09-12 16:42:18 -07:00
parent 7bd403c16a 83c76118eb
commit c0dfecfb89
2 changed files with 317 additions and 19 deletions
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -123,6 +123,8 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,
    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;