Extend VBP ME improvement for speed 5 to 7
RTC borg test results:
avg_psnr: ovr_psnr: ssim: encoding_spdup:
speed 5:
rtc_derf: 0.107 0.127 0.100 1.236
rtc: 0.088 0.084 0.103 1.046
speed 6:
rtc_derf: 0.085 0.148 0.140 1.149
rtc: -0.015 -0.006 -0.068 0.547
speed 7:
rtc_derf:-0.059 0.005 -0.004 0.842
rtc: 0.064 0.078 0.067 0.243
STATS_CHANGED
Change-Id: Id7e951fb26b6c1c402013c9af5f1c191491e41ed
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index a0cc5a6..2e9ecfc 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1647,7 +1647,7 @@
sf->winner_mode_sf.winner_mode_ifs = 1;
sf->rt_sf.check_intra_pred_nonrd = 1;
- sf->rt_sf.estimate_motion_for_var_based_partition = 1;
+ sf->rt_sf.estimate_motion_for_var_based_partition = 2;
sf->rt_sf.hybrid_intra_pickmode = 1;
sf->rt_sf.use_comp_ref_nonrd = 0;
sf->rt_sf.ref_frame_comp_nonrd[0] = 0;
@@ -1772,7 +1772,6 @@
if (speed >= 8) {
sf->rt_sf.sse_early_term_inter_search = EARLY_TERM_IDX_2;
- sf->rt_sf.estimate_motion_for_var_based_partition = 2;
sf->intra_sf.intra_pruning_with_hog = 1;
sf->rt_sf.short_circuit_low_temp_var = 1;
sf->rt_sf.use_nonrd_altref_frame = 0;