From d96ed96c0fb125f0369b48910f24ed85dccc39b2 Mon Sep 17 00:00:00 2001 From: hui su Date: Tue, 20 Jun 2017 16:26:00 -0700 Subject: VP9 level targeting: properly handle max_gf_interval Don't overide max_gf_interval if it's not specified. It will be assigned with a default value in vp9_rc_set_gf_interval_range(). BUG=b/62803416 Change-Id: Ide46ce00279ed076865fc54ce98c55a994f0c798 --- vp9/vp9_cx_iface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'vp9') diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index bb6b30bd4..d18457f34 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -432,8 +432,12 @@ static void config_target_level(VP9EncoderConfig *oxcf) { (int)vp9_level_defs[target_level_index].min_altref_distance) { oxcf->min_gf_interval = (int)vp9_level_defs[target_level_index].min_altref_distance + 1; - oxcf->max_gf_interval = - VPXMAX(oxcf->max_gf_interval, oxcf->min_gf_interval); + // If oxcf->max_gf_interval == 0, it will be assigned with a default value + // in vp9_rc_set_gf_interval_range(). + if (oxcf->max_gf_interval != 0) { + oxcf->max_gf_interval = + VPXMAX(oxcf->max_gf_interval, oxcf->min_gf_interval); + } } // Adjust maximum column tiles. -- cgit v1.2.3