Merge "Adds two new subpel search methods"

vp9/encoder/vp9_mcomp.h

@@ -108,6 +108,8 @@ typedef int (fractional_mv_step_fp) (
 
 extern fractional_mv_step_fp vp9_find_best_sub_pixel_tree;
 extern fractional_mv_step_fp vp9_find_best_sub_pixel_tree_pruned;
+extern fractional_mv_step_fp vp9_find_best_sub_pixel_tree_pruned_more;
+extern fractional_mv_step_fp vp9_find_best_sub_pixel_surface_fit;
 
 typedef int (*vp9_full_search_fn_t)(const MACROBLOCK *x,
                                     const MV *ref_mv, int sad_per_bit,

vp9/encoder/vp9_speed_features.c

@@ -421,6 +421,10 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
     cpi->find_fractional_mv_step = vp9_find_best_sub_pixel_tree;
   } else if (sf->mv.subpel_search_method == SUBPEL_TREE_PRUNED) {
     cpi->find_fractional_mv_step = vp9_find_best_sub_pixel_tree_pruned;
+  } else if (sf->mv.subpel_search_method == SUBPEL_TREE_PRUNED_MORE) {
+    cpi->find_fractional_mv_step = vp9_find_best_sub_pixel_tree_pruned_more;
+  } else if (sf->mv.subpel_search_method == SUBPEL_SURFACE_FIT) {
+    cpi->find_fractional_mv_step = vp9_find_best_sub_pixel_surface_fit;
   }
 
   cpi->mb.optimize = sf->optimize_coefficients == 1 && oxcf->pass != 1;

vp9/encoder/vp9_speed_features.h

@@ -79,6 +79,8 @@ typedef enum {
 typedef enum {
   SUBPEL_TREE = 0,
   SUBPEL_TREE_PRUNED = 1,
+  SUBPEL_TREE_PRUNED_MORE = 2,
+  SUBPEL_SURFACE_FIT = 3,
   // Other methods to come
 } SUBPEL_SEARCH_METHODS;