summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2020-01-27 06:06:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-01-27 06:06:29 +0000
commit4254ecaa075e672b66b9d723ebdd3d7ed7125055 (patch)
treea87f9c27e50cef7243eed9b45db3d950640ef227
parent78859608302d9ec5bf6e5d04347746b5620bb03f (diff)
parentcafbef75bfb3a1604307bb26703fe8f333bed7b1 (diff)
downloadlibvpx-4254ecaa075e672b66b9d723ebdd3d7ed7125055.tar
libvpx-4254ecaa075e672b66b9d723ebdd3d7ed7125055.tar.gz
libvpx-4254ecaa075e672b66b9d723ebdd3d7ed7125055.tar.bz2
libvpx-4254ecaa075e672b66b9d723ebdd3d7ed7125055.zip
Merge "vp9-rtc: Fix condition in regulate_q for cyclic_refresh"
-rw-r--r--vp9/encoder/vp9_ratectrl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index cbafbf7b9..a5dbab631 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -826,8 +826,7 @@ int vp9_rc_regulate_q(const VP9_COMP *cpi, int target_bits_per_frame,
i = active_best_quality;
do {
- if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled &&
- cr->apply_cyclic_refresh &&
+ if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cr->apply_cyclic_refresh &&
(!cpi->oxcf.gf_cbr_boost_pct || !cpi->refresh_golden_frame)) {
bits_per_mb_at_this_q =
(int)vp9_cyclic_refresh_rc_bits_per_mb(cpi, i, correction_factor);