Commit ced5cea4 authored by Marco Paniconi's avatar Marco Paniconi Committed by Gerrit Code Review

Merge "vp9-aqmode=3: Limit on period for golden update."

parents acc248e8 fab630fa
...@@ -321,11 +321,11 @@ void vp9_cyclic_refresh_postencode(VP9_COMP *const cpi) { ...@@ -321,11 +321,11 @@ void vp9_cyclic_refresh_postencode(VP9_COMP *const cpi) {
void vp9_cyclic_refresh_set_golden_update(VP9_COMP *const cpi) { void vp9_cyclic_refresh_set_golden_update(VP9_COMP *const cpi) {
RATE_CONTROL *const rc = &cpi->rc; RATE_CONTROL *const rc = &cpi->rc;
CYCLIC_REFRESH *const cr = cpi->cyclic_refresh; CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
// Set minimum gf_interval for GF update to a multiple (== 2) of refresh // Set minimum gf_interval for GF update to a multiple of the refresh period,
// period. Depending on past encoding stats, GF flag may be reset and update // with some max limit. Depending on past encoding stats, GF flag may be
// may not occur until next baseline_gf_interval. // reset and update may not occur until next baseline_gf_interval.
if (cr->percent_refresh > 0) if (cr->percent_refresh > 0)
rc->baseline_gf_interval = 4 * (100 / cr->percent_refresh); rc->baseline_gf_interval = VPXMIN(4 * (100 / cr->percent_refresh), 40);
else else
rc->baseline_gf_interval = 40; rc->baseline_gf_interval = 40;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment