commit d632d032d569121537a3873935373456e10d1308
author Yunqing Wang <yunqingwang@google.com> Tue Dec 20 15:45:20 2022 -0800
committer Yunqing Wang <yunqingwang@google.com> Wed Dec 21 02:34:25 2022 +0000
tree 273faa508174ef8a9fd1c14a27f141bd881a36a2
parent 43d3c66ce26474a3b1c04f7d17720d2e57614865

Remove redundant speed feature setting

estimate_motion_for_var_based_partition is enabled for RTC speed
5 to 8, and disabled for speed 9 annd 10. Removed unneeded setting.

Change-Id: I16614f9b111cf2bdc65992fbc006a15e21cebf5e

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 5d27e96..4a3a3e5 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1352,12 +1352,6 @@
     if (speed == 7) {
       sf->rt_sf.nonrd_check_partition_merge_mode = 2;
     }
-    if (speed >= 8) {
-      sf->rt_sf.estimate_motion_for_var_based_partition = 1;
-    }
-    if (speed >= 9) {
-      sf->rt_sf.estimate_motion_for_var_based_partition = 0;
-    }
   }
   if (!is_720p_or_larger) {
     if (speed >= 9) {
@@ -1754,7 +1748,6 @@
   if (speed >= 8) {
     sf->rt_sf.sse_early_term_inter_search = EARLY_TERM_IDX_2;
     sf->intra_sf.intra_pruning_with_hog = 1;
-    sf->rt_sf.estimate_motion_for_var_based_partition = 1;
     sf->rt_sf.short_circuit_low_temp_var = 1;
     sf->rt_sf.use_nonrd_altref_frame = 0;
     sf->rt_sf.nonrd_prune_ref_frame_search = 2;