rtc: Fix to low_temp_var_flag for real-time
The low_temp_var_flag is set based on the result
of the int_pro motion from variance part, unless
sf->short_circuit_low_temp_var = 1.
So set this speed feature to 1 in speed 8, since
sf->estimate_motion_for_var_based_partition is not
always on (currently off for resol >=480p at speed 8).
Change only affects 720p clips:
bdrate gain on rtc set: gain ranges ~0.1 to ~0.8%,
with one clip over 2% gain.
~2-3% speed loss on clip with max bdrate gain.
Change-Id: I9b8944d4de383719ccb6f2b62eef7a1ec3f994cf
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 5eb8993..bc3e5d5 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -690,7 +690,7 @@
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 = 3;
+ sf->short_circuit_low_temp_var = 1;
sf->reuse_inter_pred_nonrd = 1;
sf->max_intra_bsize = BLOCK_32X32;
// This gives ~2% bdrate improvement but with 5-10% slowdown.
diff --git a/av1/encoder/var_based_part.c b/av1/encoder/var_based_part.c
index 712ce1c..b25e7c1 100644
--- a/av1/encoder/var_based_part.c
+++ b/av1/encoder/var_based_part.c
@@ -463,7 +463,8 @@
// higher the more aggressive.
if (ref_frame_partition == LAST_FRAME &&
(cpi->sf.short_circuit_low_temp_var == 1 ||
- (xd->mi[0]->mv[0].as_mv.col < mv_thr &&
+ (cpi->sf.estimate_motion_for_var_based_partition &&
+ xd->mi[0]->mv[0].as_mv.col < mv_thr &&
xd->mi[0]->mv[0].as_mv.col > -mv_thr &&
xd->mi[0]->mv[0].as_mv.row < mv_thr &&
xd->mi[0]->mv[0].as_mv.row > -mv_thr))) {
