summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco <marpan@google.com>2017-09-19 11:00:40 -0700
committerMarco <marpan@google.com>2017-09-19 11:12:37 -0700
commitcd463c7acb52160fd001a5ec311b27802d97e7d1 (patch)
treece1c19f58641f74d0e068738b29e191793ff72d5
parent310e3884239ec70fd390a42bfe3a81fcff155a29 (diff)
downloadlibvpx-cd463c7acb52160fd001a5ec311b27802d97e7d1.tar
libvpx-cd463c7acb52160fd001a5ec311b27802d97e7d1.tar.gz
libvpx-cd463c7acb52160fd001a5ec311b27802d97e7d1.tar.bz2
libvpx-cd463c7acb52160fd001a5ec311b27802d97e7d1.zip
vp9: Fix condition for limiting ARF 1 pass vbr.
Fix the setting to frames_till_gf_update_due, and adjust the limit value. Only affects when USE_ALTREF_FOR_ONE_PASS is enabled. Neutral change to metrics and speed for ytlive. Change-Id: I266d9a00b36221bc8602fa2746d4e8a8f7d4dfae
-rw-r--r--vp9/encoder/vp9_ratectrl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 93de41e86..073c76ac0 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -2220,9 +2220,10 @@ static void adjust_gf_boost_lag_one_pass_vbr(VP9_COMP *cpi,
rc->source_alt_ref_pending = 1;
rc->alt_ref_gf_group = 1;
// If alt-ref is used for this gf group, limit the interval.
- if (rc->baseline_gf_interval > 10 &&
- rc->baseline_gf_interval < rc->frames_to_key)
- rc->baseline_gf_interval = 10;
+ if (rc->baseline_gf_interval > 12) {
+ rc->baseline_gf_interval = 12;
+ rc->frames_till_gf_update_due = rc->baseline_gf_interval;
+ }
}
}
#endif