virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity

lavc/h265_profile_level: Do not allow high tier at level < 4

Browse Source
This commit is contained in:
Mark Thompson 2019-05-06 22:02:20 +01:00
parent c1a430885d
commit f344bb2466
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/h265_profile_level.c
View File

@ -175,7 +175,7 @@ const H265LevelDescriptor *ff_h265_guess_level(const H265RawProfileTierLevel *pt
int max_dec_pic_buffering)
{
const H265ProfileDescriptor *profile;
int pic_size, lbr_flag, hbr_factor;
int pic_size, tier_flag, lbr_flag, hbr_factor;
int i;
if (ptl)
@ -189,10 +189,13 @@ const H265LevelDescriptor *ff_h265_guess_level(const H265RawProfileTierLevel *pt
pic_size = width * height;
if (ptl)
lbr_flag = ptl->general_lower_bit_rate_constraint_flag;
else
lbr_flag = profile->lower_bit_rate > 0;
if (ptl) {
tier_flag = ptl->general_tier_flag;
lbr_flag = ptl->general_lower_bit_rate_constraint_flag;
} else {
tier_flag = 0;
lbr_flag = profile->lower_bit_rate > 0;
}
if (profile->profile_idc == 1 || profile->profile_idc == 2) {
hbr_factor = 1;
} else if (profile->high_throughput) {
@ -208,6 +211,9 @@ const H265LevelDescriptor *ff_h265_guess_level(const H265RawProfileTierLevel *pt
const H265LevelDescriptor *level = &h265_levels[i];
int max_br, max_dpb_size;
if (tier_flag && !level->max_br_high)
continue;
if (pic_size > level->max_luma_ps)
continue;
if (width * width > 8 * level->max_luma_ps)
@ -222,7 +228,7 @@ const H265LevelDescriptor *ff_h265_guess_level(const H265RawProfileTierLevel *pt
if (tile_cols > level->max_tile_cols)
continue;
if (ptl && ptl->general_tier_flag)
if (tier_flag)
max_br = level->max_br_high;
else
max_br = level->max_br_main;