The bits_per_mb factor from cyclic refresh does not need to be conditioned on seg_enabled, cr->apply_cyclic_refresh is sufficient. This is more correct for the case where the refresh is turned off/on dynamically. Small/neutral change in bdrate metrics.
Unified · Split
| @@ -826,8 +826,7 @@ int vp9_rc_regulate_q(const VP9_COMP *cpi, int target_bits_per_frame, · 825 unmodified lines | |||
| 826 | i = active_best_quality; | 826 | i = active_best_quality; |
| 827 | 827 | ||
| 828 | do { | 828 | do { |
| 829 | if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled && | 829 | if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cr->apply_cyclic_refresh && |
| 830 | cr->apply_cyclic_refresh && | ||
| 831 | (!cpi->oxcf.gf_cbr_boost_pct || !cpi->refresh_golden_frame)) { | 830 | (!cpi->oxcf.gf_cbr_boost_pct || !cpi->refresh_golden_frame)) { |
| 832 | bits_per_mb_at_this_q = | 831 | bits_per_mb_at_this_q = |
| 833 | (int)vp9_cyclic_refresh_rc_bits_per_mb(cpi, i, correction_factor); | 832 | (int)vp9_cyclic_refresh_rc_bits_per_mb(cpi, i, correction_factor); |