Merge "Increase disable_filter_search_var_thresh threshold"

diff --cc vp9/encoder/vp9_onyx_if.c
index e010c091787abed04c6a4ef32d0dfbedca082427,942ee39aa2aad20b232f884ca561319f7ba774b6..d7bfc1db7e6bdb24e7e12595fec9e70aed531e99
--- 1/vp9/encoder/vp9_onyx_if.c
--- 2/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@@ -746,10 -743,9 +746,10 @@@ void vp9_set_speed_features(VP9_COMP *c
  
          sf->use_rd_breakout = 1;
          sf->adaptive_motion_search = 1;
 +        sf->adaptive_pred_filter_type = 2;
          sf->auto_mv_step_size = 1;
  
-         sf->disable_filter_search_var_thresh = 16;
+         sf->disable_filter_search_var_thresh = 50;
          sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
  
          sf->auto_min_max_partition_size = 1;
@@@ -782,10 -778,9 +782,10 @@@
  
          sf->use_rd_breakout = 1;
          sf->adaptive_motion_search = 1;
 +        sf->adaptive_pred_filter_type = 2;
          sf->auto_mv_step_size = 1;
  
-         sf->disable_filter_search_var_thresh = 16;
+         sf->disable_filter_search_var_thresh = 100;
          sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
  
          sf->auto_min_max_partition_size = 1;
@@@ -816,10 -811,9 +816,10 @@@
  
          sf->use_rd_breakout = 1;
          sf->adaptive_motion_search = 1;
 +        sf->adaptive_pred_filter_type = 2;
          sf->auto_mv_step_size = 1;
  
-         sf->disable_filter_search_var_thresh = 16;
+         sf->disable_filter_search_var_thresh = 200;
          sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
  
          sf->auto_min_max_partition_size = 1;