Extend few inter sfs from speed 2 to 1

The sfs 'prune_comp_using_best_single_mode_ref',
'use_dist_wtd_comp_flag' and
'prune_comp_using_best_single_mode_ref' are enabled at
speed=1.

     Encoder Instruction                BD-Rate Loss(%)
cpu  Count Reduction(%)  avg.psnr  ovr.psnr  ssim     vmaf   vmaf_neg
 1       22.28            0.4470    0.4468  0.2964   0.3050   0.3745

STATS_CHANGED for speed = 1

Change-Id: Ic9c5919d155d7d1aa62bf5284eb00dadacbfa203
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 4617a3e..058204c 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1169,6 +1169,9 @@
     sf->inter_sf.reuse_inter_intra_mode = 1;
     sf->inter_sf.selective_ref_frame = 2;
     sf->inter_sf.skip_arf_compound = 1;
+    sf->inter_sf.prune_comp_using_best_single_mode_ref = 2;
+    sf->inter_sf.use_dist_wtd_comp_flag = DIST_WTD_COMP_DISABLED;
+    sf->inter_sf.enable_fast_compound_mode_search = 1;
 
     sf->interp_sf.use_interp_filter = 1;
 
@@ -1219,11 +1222,8 @@
     sf->inter_sf.fast_interintra_wedge_search = 1;
     sf->inter_sf.prune_comp_search_by_single_result = boosted ? 4 : 1;
     sf->inter_sf.prune_ext_comp_using_neighbors = 1;
-    sf->inter_sf.prune_comp_using_best_single_mode_ref = 2;
     sf->inter_sf.prune_comp_type_by_comp_avg = 2;
     sf->inter_sf.selective_ref_frame = 3;
-    sf->inter_sf.use_dist_wtd_comp_flag = DIST_WTD_COMP_DISABLED;
-    sf->inter_sf.enable_fast_compound_mode_search = 1;
     sf->inter_sf.reuse_mask_search_results = 1;
     set_txfm_rd_gate_level(sf->inter_sf.txfm_rd_gate_level, boosted ? 0 : 1);
     sf->inter_sf.inter_mode_txfm_breakout = boosted ? 0 : 1;