commit 767732cf66ad53b231603f2c6aaeca2d11228148
author Yunqing Wang <yunqingwang@google.com> Tue Jun 15 18:13:47 2021 -0700
committer Yunqing Wang <yunqingwang@google.com> Thu Jun 17 02:43:54 2021 +0000
tree b27d5aee54bfe89a1260089f8e33b898cacc9cf2
parent 1fabe9804ed7928cdb15499d3986e3336f261f4b

Extend LR features to speed 2

Extended 2 LR features to speed up speed 2.
Borg result at speed 2:
         avg_psnr:  ovr_psnr:  ssim:  speed:
lowres2:  0.047      0.049     0.017  2.905
midres2:  0.117      0.116     0.076  3.688
hdres2:   0.115      0.115     0.063  3.612

STATS_CHANGED

Change-Id: Ide3b259b256223d71004f620c5b1eebef76e7e4c

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index ed8249d..95a7fc2 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -899,6 +899,8 @@
 
     sf->lpf_sf.prune_wiener_based_on_src_var = 1;
     sf->lpf_sf.prune_sgr_based_on_wiener = 1;
+    sf->lpf_sf.disable_loop_restoration_chroma = boosted ? 0 : 1;
+    sf->lpf_sf.reduce_wiener_window_size = boosted ? 0 : 1;
 
     // TODO(any): Re-evaluate this feature set to 1 in speed 2.
     sf->tpl_sf.allow_compound_pred = 0;
@@ -970,12 +972,9 @@
                       ? 1
                       : 2;
 
-    // TODO(any): evaluate if these lpf features can be moved to speed 2.
     // For screen content, "prune_sgr_based_on_wiener = 2" cause large quality
     // loss.
     sf->lpf_sf.prune_sgr_based_on_wiener = allow_screen_content_tools ? 1 : 2;
-    sf->lpf_sf.disable_loop_restoration_chroma = boosted ? 0 : 1;
-    sf->lpf_sf.reduce_wiener_window_size = !boosted;
     sf->lpf_sf.prune_wiener_based_on_src_var = 2;
   }