commit 00353b4ce0b326fe8173cc1dff14ed1126d4d85e
author Nithya V S <nithya.vs@ittiam.com> Sun Jun 06 17:04:50 2021 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Jun 08 16:17:51 2021 +0000
tree fc882fa52cc7e87b6a1f71014b2572982cae6ee9
parent ddf0b681ea0a82d00003291ceeecac205015f9d1

Disable interintra modes for lowres in speed 2

Interintra modes are disabled for lowres contents in speed 2.

          Instruction Count       BD-Rate Loss(%)
cpu-used    Reduction(%)     avg.psnr  ovr.psnr   ssim
   2          3.650           0.0755    0.0748   0.0694

STATS_CHANGED

Change-Id: I2a0b766304ed7171df81eae9785fb6c334be9939

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 8cfb977..8a1f964 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -621,6 +621,12 @@
     }
 
     if (is_480p_or_larger) {
+      sf->inter_sf.disable_interintra_wedge_var_thresh = 100;
+    } else {
+      sf->inter_sf.disable_interintra_wedge_var_thresh = UINT_MAX;
+    }
+
+    if (is_480p_or_larger) {
       sf->tx_sf.tx_type_search.prune_tx_type_using_stats = 1;
       if (use_hbd) sf->tx_sf.prune_tx_size_level = 2;
     } else {
@@ -648,6 +654,8 @@
     if (use_hbd) sf->tx_sf.prune_tx_size_level = 3;
 
     if (is_480p_or_larger) sf->intra_sf.top_intra_model_count_allowed = 2;
+
+    sf->inter_sf.disable_interintra_wedge_var_thresh = UINT_MAX;
   }
 
   if (speed >= 4) {
@@ -853,7 +861,6 @@
     // bit more closely to figure out why.
     sf->inter_sf.adaptive_rd_thresh = 1;
     sf->inter_sf.comp_inter_joint_search_thresh = BLOCK_SIZES_ALL;
-    sf->inter_sf.disable_interintra_wedge_var_thresh = 100;
     sf->inter_sf.disable_interinter_wedge_var_thresh = 100;
     sf->inter_sf.fast_interintra_wedge_search = 1;
     sf->inter_sf.prune_comp_search_by_single_result = boosted ? 4 : 1;
@@ -1778,6 +1785,8 @@
   if (!cpi->ppi->seq_params_locked) {
     cpi->common.seq_params->enable_masked_compound &=
         !sf->inter_sf.disable_masked_comp;
+    cpi->common.seq_params->enable_interintra_compound &=
+        (sf->inter_sf.disable_interintra_wedge_var_thresh != UINT_MAX);
   }
 
   // This is only used in motion vector unit test.