Adjust speed 4 features

adjusted 1 speed features at speed 4.

AWCY test showed 0.02% PSNR loss.
Average 2% encoder speedup.

STATS_CHANGED

Change-Id: Id1f0c5394788248f7a11f9bfcb4daf3d46ce9656

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 4ccab69..b643fd5 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -342,16 +342,18 @@
     sf->disable_loop_restoration_chroma =
         (boosted || cm->allow_screen_content_tools) ? 0 : 1;
     sf->reduce_wiener_window_size = !boosted;
-    sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED;
     sf->cb_pred_filter_search = 1;
     sf->adaptive_mode_search = 1;
     sf->alt_ref_search_fp = 1;
     sf->skip_sharp_interp_filter_search = 1;
     sf->perform_coeff_opt = is_boosted_arf2_bwd_type ? 2 : 4;
     sf->adaptive_txb_search_level = boosted ? 2 : 3;
+    sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_MORE;
   }
 
   if (speed >= 5) {
+    // Note(yunqing): This recode feature causes big quality drop in vbr
+    // encoding. Need to work on it.
     sf->recode_loop = ALLOW_RECODE_KFMAXBW;
     sf->intra_y_mode_mask[TX_64X64] = INTRA_DC_H_V;
     sf->intra_uv_mode_mask[TX_64X64] = UV_INTRA_DC_H_V_CFL;
@@ -360,8 +362,6 @@
     sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V;
     sf->intra_uv_mode_mask[TX_16X16] = UV_INTRA_DC_H_V_CFL;
 
-    sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_MORE;
-
     // TODO(any): The following features have no impact on quality and speed,
     // and are disabled.
     // sf->disable_filter_search_var_thresh = 200;