rtc-screen: Fix to part_early_exit_zeromv with aq=3
The part_early_exit_zeromv feature in the variance
partition was conditioned on cyclic refresh being applied.
This causes high rate fluctuation at very low Q, when
the cyclic_refresh is suddenly turned off, and prevents
the encoded bitrate to go down (for static content at min q).
Removing the cyclic refresh condition allows the encoded
bitrate to go close to zero at min q encoding, when the
cyclic refresh is turned off.
Also add a conditions of x=30 frames from key frame
in order for skip feature to be testd.
This generally has bdrate gain over rtc_screen set,
and completely changes the curve for screenshare_stationary.
Also it will undershoot for a few clips at higher bitrates
(screen_recording and slides_webplot) since they can settle
down to the min-q.
Change-Id: Iaf23ce5554c6a37c2f1a2f157ce1df264b8c549d
diff --git a/av1/encoder/var_based_part.c b/av1/encoder/var_based_part.c
index dcf75f6..3498116 100644
--- a/av1/encoder/var_based_part.c
+++ b/av1/encoder/var_based_part.c
@@ -1354,14 +1354,13 @@
// If the superblock is completely static (zero source sad) and
// the y_sad (relative to LAST ref) is very small, take the sb_size partition
// and exit, and force zeromv_last skip mode for nonrd_pickmode.
- // Only do this when the cyclic refresh is applied, and only on the base
- // segment (so the QP-boosted segment can still contnue cleaning/ramping
- // up the quality). Condition on color uv_sad is also added.
+ // Only do this on the base segment (so the QP-boosted segment, if applied,
+ // can still continue cleaning/ramping up the quality).
+ // Condition on color uv_sad is also added.
if (!is_key_frame && cpi->sf.rt_sf.part_early_exit_zeromv &&
- cpi->oxcf.q_cfg.aq_mode == CYCLIC_REFRESH_AQ &&
- cpi->cyclic_refresh->apply_cyclic_refresh &&
- segment_id == CR_SEGMENT_ID_BASE && is_set_force_zeromv_skip &&
- ref_frame_partition == LAST_FRAME && xd->mi[0]->mv[0].as_int == 0) {
+ cpi->rc.frames_since_key > 30 && segment_id == CR_SEGMENT_ID_BASE &&
+ is_set_force_zeromv_skip && ref_frame_partition == LAST_FRAME &&
+ xd->mi[0]->mv[0].as_int == 0) {
const int block_width = mi_size_wide[cm->seq_params->sb_size];
const int block_height = mi_size_high[cm->seq_params->sb_size];
const unsigned int thresh_exit_part_y =
