diff options
| author | Marco Paniconi <marpan@google.com> | 2016-01-27 21:38:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-27 21:38:35 +0000 |
| commit | ced5cea41ca92ff2f47e4bd094c69a3452ff95a5 (patch) | |
| tree | 4ee0b7799ea6dabfcbc3798ecd128610cd828ae7 | |
| parent | acc248e83dc02a9499b281265c70322aa3e7afae (diff) | |
| parent | fab630fac9255e80e79597c174b377a407f1f808 (diff) | |
| download | libvpx-ced5cea41ca92ff2f47e4bd094c69a3452ff95a5.tar libvpx-ced5cea41ca92ff2f47e4bd094c69a3452ff95a5.tar.gz libvpx-ced5cea41ca92ff2f47e4bd094c69a3452ff95a5.tar.bz2 libvpx-ced5cea41ca92ff2f47e4bd094c69a3452ff95a5.zip | |
Merge "vp9-aqmode=3: Limit on period for golden update."
| -rw-r--r-- | vp9/encoder/vp9_aq_cyclicrefresh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_aq_cyclicrefresh.c b/vp9/encoder/vp9_aq_cyclicrefresh.c index de0951966..de6deb53b 100644 --- a/vp9/encoder/vp9_aq_cyclicrefresh.c +++ b/vp9/encoder/vp9_aq_cyclicrefresh.c @@ -321,11 +321,11 @@ void vp9_cyclic_refresh_postencode(VP9_COMP *const cpi) { void vp9_cyclic_refresh_set_golden_update(VP9_COMP *const cpi) { RATE_CONTROL *const rc = &cpi->rc; CYCLIC_REFRESH *const cr = cpi->cyclic_refresh; - // Set minimum gf_interval for GF update to a multiple (== 2) of refresh - // period. Depending on past encoding stats, GF flag may be reset and update - // may not occur until next baseline_gf_interval. + // Set minimum gf_interval for GF update to a multiple of the refresh period, + // with some max limit. Depending on past encoding stats, GF flag may be + // reset and update may not occur until next baseline_gf_interval. 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 rc->baseline_gf_interval = 40; } |