generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "VP9 level targeting: properly handle max_gf_interval"

Browse Source
This commit is contained in:
Hui Su
2017-06-21 20:38:44 +00:00
committed by Gerrit Code Review
parent 0aa3677d9d d96ed96c0f
commit 96ec8a425b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vp9/vp9_cx_iface.c
View File

@@ -432,9 +432,13 @@ static void config_target_level(VP9EncoderConfig *oxcf) {
(int)vp9_level_defs[target_level_index].min_altref_distance) { (int)vp9_level_defs[target_level_index].min_altref_distance) {
oxcf->min_gf_interval = oxcf->min_gf_interval =
(int)vp9_level_defs[target_level_index].min_altref_distance + 1; (int)vp9_level_defs[target_level_index].min_altref_distance + 1;
// 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 = oxcf->max_gf_interval =
VPXMAX(oxcf->max_gf_interval, oxcf->min_gf_interval); VPXMAX(oxcf->max_gf_interval, oxcf->min_gf_interval);
} }
}
// Adjust maximum column tiles. // Adjust maximum column tiles.
if (vp9_level_defs[target_level_index].max_col_tiles < if (vp9_level_defs[target_level_index].max_col_tiles <