diff options
| author | hui su <huisu@google.com> | 2017-06-20 16:26:00 -0700 |
|---|---|---|
| committer | hui su <huisu@google.com> | 2017-06-20 16:29:04 -0700 |
| commit | d96ed96c0fb125f0369b48910f24ed85dccc39b2 (patch) | |
| tree | a82f77fd9e76b390550eae3965d8468c963fa7f5 /vp9/vp9_cx_iface.c | |
| parent | 492d52b9cc549f0d8d8d6f370425a0cee16237eb (diff) | |
| download | libvpx-d96ed96c0fb125f0369b48910f24ed85dccc39b2.tar libvpx-d96ed96c0fb125f0369b48910f24ed85dccc39b2.tar.gz libvpx-d96ed96c0fb125f0369b48910f24ed85dccc39b2.tar.bz2 libvpx-d96ed96c0fb125f0369b48910f24ed85dccc39b2.zip | |
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
Diffstat (limited to 'vp9/vp9_cx_iface.c')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 8 |
1 files changed, 6 insertions, 2 deletions
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. |