virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/vvc: parse all SEI messages

Browse Source 
While the current code iterated over the messages, it always returned
in the first iteration. Instead keep iterating and warn for failure to
parse. At time of writing, none of the parsing functions seems to
actually return an error, ever.

Fix CID 1648348
This commit is contained in:
Marvin Scholz
2025-06-11 20:52:06 +02:00
committed by Nuo Mi
parent 3d7668dae1
commit 9ad6dca28c
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/vvc/sei.c
View File

@ -184,6 +184,7 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
for (int i = 0; i < sei->message_list.nb_messages; i++) { for (int i = 0; i < sei->message_list.nb_messages; i++) {
int ret = 0;
SEIRawMessage *message = &sei->message_list.messages[i]; SEIRawMessage *message = &sei->message_list.messages[i];
void *payload = message->payload; void *payload = message->payload;
@ -193,25 +194,32 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon
c->film_grain_characteristics = av_refstruct_allocz(sizeof(*c->film_grain_characteristics)); c->film_grain_characteristics = av_refstruct_allocz(sizeof(*c->film_grain_characteristics));
if (!c->film_grain_characteristics) if (!c->film_grain_characteristics)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
return decode_film_grain_characteristics(c->film_grain_characteristics, payload, fc); ret = decode_film_grain_characteristics(c->film_grain_characteristics, payload, fc);
break;
case SEI_TYPE_DECODED_PICTURE_HASH: case SEI_TYPE_DECODED_PICTURE_HASH:
return decode_decoded_picture_hash(&s->picture_hash, payload); ret = decode_decoded_picture_hash(&s->picture_hash, payload);
break;
case SEI_TYPE_DISPLAY_ORIENTATION: case SEI_TYPE_DISPLAY_ORIENTATION:
return decode_display_orientation(&s->common.display_orientation, payload); ret = decode_display_orientation(&s->common.display_orientation, payload);
break;
case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
return decode_content_light_level_info(&s->common.content_light, payload); ret = decode_content_light_level_info(&s->common.content_light, payload);
break;
case SEI_TYPE_FRAME_FIELD_INFO: case SEI_TYPE_FRAME_FIELD_INFO:
return decode_frame_field_info(&s->frame_field_info, payload); ret = decode_frame_field_info(&s->frame_field_info, payload);
break;
case SEI_TYPE_AMBIENT_VIEWING_ENVIRONMENT: case SEI_TYPE_AMBIENT_VIEWING_ENVIRONMENT:
return decode_ambient_viewing_environment(&s->common.ambient_viewing_environment, payload); ret = decode_ambient_viewing_environment(&s->common.ambient_viewing_environment, payload);
break;
case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME:
return decode_mastering_display_colour_volume(&s->common.mastering_display, payload); ret = decode_mastering_display_colour_volume(&s->common.mastering_display, payload);
break;
default: default:
av_log(fc->log_ctx, AV_LOG_DEBUG, "Skipped %s SEI %d\n", av_log(fc->log_ctx, AV_LOG_DEBUG, "Skipped %s SEI %d\n",
@ -219,6 +227,13 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon
"PREFIX" : "SUFFIX", message->payload_type); "PREFIX" : "SUFFIX", message->payload_type);
return FF_H2645_SEI_MESSAGE_UNHANDLED; return FF_H2645_SEI_MESSAGE_UNHANDLED;
} }
if (ret == AVERROR(ENOMEM))
return ret;
if (ret < 0)
av_log(fc->log_ctx, AV_LOG_WARNING, "Failure to parse %s SEI %d: %s\n",
sei->nal_unit_header.nal_unit_type == VVC_PREFIX_SEI_NUT ?
"PREFIX" : "SUFFIX", message->payload_type, av_err2str(ret));
} }
return 0; return 0;