commit 919f62772103b92ce560e8a6e794264266135b7b
author Fyodor Kyslov <kyslov@google.com> Fri Nov 08 11:13:17 2019 -0800
committer Fyodor Kyslov <kyslov@google.com> Sat Nov 09 04:28:23 2019 +0000
tree 044bea0e8ea35d0798dbb762ae67eb2a538388e5
parent 3dc59f5569e55c19502ca78da29a10526ed49868

AV1 RT: Modify speed 7 to use fast nonRD with partition merge

Overall +6% BDR on lowres for speed7 and about twice faster than
current speed7. On rtc set the gain over current speed7 is 9.9%
with some clips up to 20%

Change-Id: If02821da889c2321dfa5ca04582464971ec5f9d9

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index e7d8c53..6876e35 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -671,32 +671,31 @@
     sf->mv.search_method = FAST_DIAMOND;
     sf->partition_search_type = VAR_BASED_PARTITION;
     sf->mode_search_skip_flags |= FLAG_SKIP_INTRA_DIRMISMATCH;
-    sf->use_real_time_ref_set = 1;
-    // Can't use LARGEST TX mode with pre-calculated partition
-    // and disabled TX64
-    if (!cpi->oxcf.enable_tx64) sf->tx_size_search_level = 1;
+    sf->tx_size_search_level = 1;
     sf->use_nonrd_pick_mode = 1;
+    sf->use_fast_nonrd_pick_mode = 1;
     sf->use_comp_ref_nonrd = 0;
     sf->inter_mode_rd_model_estimation = 2;
     sf->cdef_pick_method = CDEF_PICK_FROM_Q;
-    sf->max_intra_bsize = BLOCK_16X16;
+    sf->max_intra_bsize = BLOCK_32X32;
     sf->skip_interp_filter_search = 0;
+    sf->short_circuit_low_temp_var = 0;
+    sf->reuse_inter_pred_nonrd = 0;
+    sf->nonrd_reduce_golden_mode_search = 0;
+    sf->nonrd_use_blockyrd_interp_filter = 1;
+    sf->nonrd_merge_partition = 1;
+    sf->use_nonrd_altref_frame = 1;
+    sf->mv.subpel_search_method = SUBPEL_TREE;
   }
   if (speed >= 8) {
-    sf->use_fast_nonrd_pick_mode = 1;
-    // Consider moving nonrd_merge_partition to speed 7
-#if 0
-    sf->nonrd_merge_partition = 1;
-#endif
+    sf->nonrd_merge_partition = 0;
     sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_MORE;
-    sf->tx_size_search_level = 1;
     sf->estimate_motion_for_var_based_partition = 0;
     sf->short_circuit_low_temp_var = 1;
     sf->reuse_inter_pred_nonrd = 1;
-    sf->max_intra_bsize = BLOCK_32X32;
+    sf->nonrd_use_blockyrd_interp_filter = 0;
+    sf->use_nonrd_altref_frame = 0;
     sf->nonrd_reduce_golden_mode_search = 1;
-    // This gives ~2% bdrate improvement but with 5-10% slowdown.
-    // sf->nonrd_use_blockyrd_interp_filter = 1;
 
 // TODO(kyslov) Enable when better model is available
 // It gives +5% speedup and 11% overall BDRate degradation
@@ -704,12 +703,6 @@
 #if 0
     sf->use_modeled_non_rd_cost = 1;
 #endif
-// TODO(kyslov) Currently enabling ALTREF leads to 10%
-// slowdown with ~3% BDRate gain with current heuristics
-// We need to refine it before enabling ALTREF
-#if 0
-    sf->use_nonrd_altref_frame = 1;
-#endif
   }
 }