Extend reduced CDEF filter search method for speed 4

Extended search method with reduced number of primary
filters for CDEF search to speed 4.

            Encode Time
cpu-used     Reduction      Quality Loss
   4          1.102%          +0.036%

STATS_CHANGED

Change-Id: I605ca4472b1b637405f4e5d3df2fd736c39f7e9c
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index ef545d9..143f56c 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -536,6 +536,10 @@
         frame_is_intra_only(&cpi->common) ? 1 : 0;
     sf->winner_mode_sf.enable_winner_mode_for_tx_size_srch = 1;
 
+    sf->lpf_sf.cdef_pick_method = cm->allow_screen_content_tools
+                                      ? CDEF_FAST_SEARCH_LVL1
+                                      : CDEF_FAST_SEARCH_LVL2;
+
     // TODO(any): The following features have no impact on quality and speed,
     // and are disabled.
     // sf->part_sf.partition_search_breakout_rate_thr = 300;
@@ -567,9 +571,6 @@
         (boosted || cm->allow_screen_content_tools) ? 0 : 2;
 
     sf->lpf_sf.lpf_pick = LPF_PICK_FROM_FULL_IMAGE_NON_DUAL;
-    sf->lpf_sf.cdef_pick_method = cm->allow_screen_content_tools
-                                      ? CDEF_FAST_SEARCH_LVL1
-                                      : CDEF_FAST_SEARCH_LVL2;
     sf->lpf_sf.disable_lr_filter = 1;
 
     sf->mv_sf.prune_mesh_search = 1;