summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2018-10-22 10:37:09 -0700
committerJingning Han <jingning@google.com>2018-10-23 10:34:58 -0700
commitb77291abc9dc2884103c1846f3fc1a0395dd9e67 (patch)
tree66645ebd1052ed34426ea567d68632c7437b49bd /vp9
parent77e109340d99b3a0ddda9cb5c5d605a236eb46b2 (diff)
downloadlibvpx-b77291abc9dc2884103c1846f3fc1a0395dd9e67.tar
libvpx-b77291abc9dc2884103c1846f3fc1a0395dd9e67.tar.gz
libvpx-b77291abc9dc2884103c1846f3fc1a0395dd9e67.tar.bz2
libvpx-b77291abc9dc2884103c1846f3fc1a0395dd9e67.zip
Refactor gop_length use case in tpl model
Make it support both single- and multi-layer ARF GOP structure. Change-Id: I760a95804d1b583b057120f6d6be65195a0e6c19
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_ratectrl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 8d1d265f6..81cf8858a 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1481,12 +1481,12 @@ void vp9_configure_buffer_updates(VP9_COMP *cpi, int gf_group_index) {
}
void vp9_estimate_qp_gop(VP9_COMP *cpi) {
- int gop_length = cpi->rc.baseline_gf_interval;
+ int gop_length = cpi->twopass.gf_group.gf_group_size;
int bottom_index, top_index;
int idx;
const int gf_index = cpi->twopass.gf_group.index;
- for (idx = 1; idx <= gop_length + 1 && idx < MAX_LAG_BUFFERS; ++idx) {
+ for (idx = 1; idx < gop_length; ++idx) {
TplDepFrame *tpl_frame = &cpi->tpl_stats[idx];
int target_rate = cpi->twopass.gf_group.bit_allocation[idx];
cpi->twopass.gf_group.index = idx;