summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2015-08-07 18:38:40 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-08-07 18:38:40 +0000
commitf87fdebefca9d8f03d2758415c077033442bd167 (patch)
tree3b59d81781415c10e34f2eac33922a74651f465f
parent9b769e47f411ab30303cf8f0ca67723e5f915c49 (diff)
parentdc36e5aff0786a696d50343c74391fe9aeaec97f (diff)
downloadlibvpx-f87fdebefca9d8f03d2758415c077033442bd167.tar
libvpx-f87fdebefca9d8f03d2758415c077033442bd167.tar.gz
libvpx-f87fdebefca9d8f03d2758415c077033442bd167.tar.bz2
libvpx-f87fdebefca9d8f03d2758415c077033442bd167.zip
Merge "Fix a setting in cyclic refresh."
-rw-r--r--vp9/encoder/vp9_aq_cyclicrefresh.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_aq_cyclicrefresh.c b/vp9/encoder/vp9_aq_cyclicrefresh.c
index b61906388..a13f0c001 100644
--- a/vp9/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c
@@ -459,7 +459,10 @@ void vp9_cyclic_refresh_update_parameters(VP9_COMP *const cpi) {
cr->time_for_refresh = 0;
// Use larger delta-qp (increase rate_ratio_qdelta) for first few (~4)
// periods of the refresh cycle, after a key frame.
- if (rc->frames_since_key < 4 * cr->percent_refresh)
+ // Account for larger interval on base layer for temporal layers.
+ if (cr->percent_refresh > 0 &&
+ rc->frames_since_key < (4 * cpi->svc.number_temporal_layers) *
+ (100 / cr->percent_refresh))
cr->rate_ratio_qdelta = 3.0;
else
cr->rate_ratio_qdelta = 2.0;