virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/hevcdec: simplify decrementing of MDCV/CLL flags

Browse Source 
Mostly done to be able to update the comment so that it no longer
mentions the same flag twice.
This commit is contained in:
Jan Ekström 2023-07-12 21:15:10 +03:00
parent 43e63ff20a
commit 91e1d11d14
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/hevcdec.c
View File

@ -2760,17 +2760,15 @@ static int set_side_data(HEVCContext *s)
AVFrame *out = s->ref->frame;
int ret;
// Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=1
// so the side data persists for the entire coded video sequence.
if (s->sei.common.mastering_display.present > 0 &&
IS_IRAP(s) && s->no_rasl_output_flag) {
s->sei.common.mastering_display.present--;
}
// Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=1
// so the side data persists for the entire coded video sequence.
if (s->sei.common.content_light.present > 0 &&
IS_IRAP(s) && s->no_rasl_output_flag) {
s->sei.common.content_light.present--;
// Decrement the mastering display and content light level flag when IRAP
// frame has no_rasl_output_flag=1 so the side data persists for the entire
// coded video sequence.
if (IS_IRAP(s) && s->no_rasl_output_flag) {
if (s->sei.common.mastering_display.present > 0)
s->sei.common.mastering_display.present--;
if (s->sei.common.content_light.present > 0)
s->sei.common.content_light.present--;
}
ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC, NULL,