diff options
| author | Hui Su <huisu@google.com> | 2017-06-21 20:38:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-06-21 20:38:45 +0000 |
| commit | 96ec8a425b5dde7eb2d747146af4da10c26bd4b4 (patch) | |
| tree | b99c01a4f5fbf622af1eeaa3287c52b7191dbdbe | |
| parent | 0aa3677d9df2d732fcf49b545e2a3c5aa4a29267 (diff) | |
| parent | d96ed96c0fb125f0369b48910f24ed85dccc39b2 (diff) | |
| download | libvpx-96ec8a425b5dde7eb2d747146af4da10c26bd4b4.tar libvpx-96ec8a425b5dde7eb2d747146af4da10c26bd4b4.tar.gz libvpx-96ec8a425b5dde7eb2d747146af4da10c26bd4b4.tar.bz2 libvpx-96ec8a425b5dde7eb2d747146af4da10c26bd4b4.zip | |
Merge "VP9 level targeting: properly handle max_gf_interval"
| -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. |