commit 2d3d78203ce9ac09d9468c1b2c6561a3c45af65b
author Yunqing Wang <yunqingwang@google.com> Tue Jul 13 12:59:11 2021 -0700
committer Yunqing Wang <yunqingwang@google.com> Wed Jul 14 17:05:45 2021 +0000
tree 3a4800e323279eb150c4c7d69b4c9ceddf41bc77
parent 5e64407f710b5617b77d24ee4c6799ef68e4cd5e

Allow cdef search at RT speed 6

Removed 1 cdef speed feature that gave bad speed/quality tradeoff.
No change to other speeds.
Borg test result at RT speed 6:
         avg_psnr:  ovr_psnr:  ssim:    speed:
rtc:      -7.940     -7.101   -12.330   -4.839
rtc_derf: -2.283     -2.054   -1.731    -3.392

STATS_CHANGED

Change-Id: I6cdb6223f13072a9496d7f1d8d7ce34b2e09debe

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 1c5111f..55acd2d 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1378,11 +1378,8 @@
       sf->rt_sf.use_temporal_noise_estimate = 1;
   }
 
-  // TODO(Yunqing, any): speed 6 overall speed/quality tradeoff is bad. Need
-  // evaluate it.
   if (speed >= 6) {
     sf->part_sf.adjust_var_based_rd_partitioning = 1;
-    sf->lpf_sf.cdef_pick_method = CDEF_PICK_FROM_Q;
   }
 
   if (speed >= 7) {
@@ -1404,6 +1401,7 @@
       sf->intra_sf.intra_y_mode_mask[i] = INTRA_ALL;
     }
 
+    sf->lpf_sf.cdef_pick_method = CDEF_PICK_FROM_Q;
     sf->lpf_sf.lpf_pick = LPF_PICK_FROM_Q;
 
     sf->rt_sf.mode_search_skip_flags |= FLAG_SKIP_INTRA_DIRMISMATCH;