PR #22633 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22633 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22633.patch
>From fd3582c9d75a1b966dadef04f1c4822a1cc85289 Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Thu, 26 Mar 2026 16:43:16 -0300 Subject: [PATCH 1/6] avformat/matroskadec: refactor parsing Block Additional Use a switch case. Will be useful in the following commit. Signed-off-by: James Almer <[email protected]> --- libavformat/matroskadec.c | 47 +++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index ea57692e85..3c6419540f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3938,31 +3938,40 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, /* ITU-T T.35 metadata */ country_code = bytestream2_get_byteu(&bc); - provider_code = bytestream2_get_be16u(&bc); + switch (country_code) { + case ITU_T_T35_COUNTRY_CODE_US: + provider_code = bytestream2_get_be16u(&bc); - if (country_code != ITU_T_T35_COUNTRY_CODE_US || - provider_code != ITU_T_T35_PROVIDER_CODE_SAMSUNG) - break; // ignore + switch (provider_code) { + case ITU_T_T35_PROVIDER_CODE_SAMSUNG: { + provider_oriented_code = bytestream2_get_be16u(&bc); + application_identifier = bytestream2_get_byteu(&bc); - provider_oriented_code = bytestream2_get_be16u(&bc); - application_identifier = bytestream2_get_byteu(&bc); + if (provider_oriented_code != 1 || application_identifier != 4) + break; // ignore - if (provider_oriented_code != 1 || application_identifier != 4) - break; // ignore + hdrplus = av_dynamic_hdr_plus_alloc(&hdrplus_size); + if (!hdrplus) + return AVERROR(ENOMEM); - hdrplus = av_dynamic_hdr_plus_alloc(&hdrplus_size); - if (!hdrplus) - return AVERROR(ENOMEM); + if ((res = av_dynamic_hdr_plus_from_t35(hdrplus, bc.buffer, + bytestream2_get_bytes_left(&bc))) < 0 || + (res = av_packet_add_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, + (uint8_t *)hdrplus, hdrplus_size)) < 0) { + av_free(hdrplus); + return res; + } - if ((res = av_dynamic_hdr_plus_from_t35(hdrplus, bc.buffer, - bytestream2_get_bytes_left(&bc))) < 0 || - (res = av_packet_add_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, - (uint8_t *)hdrplus, hdrplus_size)) < 0) { - av_free(hdrplus); - return res; + return 0; + } + default: + break; + } + break; + default: + break; } - - return 0; + break; } default: break; -- 2.52.0 >From d882082359704445350a79962aa26264098b6a2a Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Thu, 26 Mar 2026 17:18:28 -0300 Subject: [PATCH 2/6] avformat/matroskadec: add support for LCEVC ITU-T35 payloads Signed-off-by: James Almer <[email protected]> --- libavformat/matroskadec.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3c6419540f..d49d3a52f6 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3968,6 +3968,32 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, break; } break; + case ITU_T_T35_COUNTRY_CODE_UK: + bytestream2_skipu(&bc, 1); // t35_uk_country_code_second_octet + if (bytestream2_get_bytes_left(&bc) < 2) + return AVERROR_INVALIDDATA; + + provider_code = bytestream2_get_be16u(&bc); + av_log(matroska->ctx, AV_LOG_WARNING, "provider_code %d\n", provider_code); + switch (provider_code) { + case ITU_T_T35_PROVIDER_CODE_VNOVA: { + uint8_t *data; + + if (bytestream2_get_bytes_left(&bc) < 2) + return AVERROR_INVALIDDATA; + + data = av_packet_new_side_data(pkt, AV_PKT_DATA_LCEVC, bytestream2_get_bytes_left(&bc)); + if (!data) + return AVERROR(ENOMEM); + + bytestream2_get_bufferu(&bc, data, bytestream2_get_bytes_left(&bc)); + + return 0; + } + default: + break; + } + break; default: break; } -- 2.52.0 >From 75269e466aeacef81991bf05fefbe912815a5412 Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Thu, 26 Mar 2026 17:23:59 -0300 Subject: [PATCH 3/6] avcodec/libdav1d: refactor parsing ITU-T35 metadata Use a switch case. Will be useful in the following commit. Signed-off-by: James Almer <[email protected]> --- libavcodec/libdav1d.c | 105 ++++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 45 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 14ec9842a0..77520744cd 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -370,67 +370,82 @@ static int parse_itut_t35_metadata(Libdav1dContext *dav1d, Dav1dPicture *p, bytestream2_init(&gb, itut_t35->payload, itut_t35->payload_size); - provider_code = bytestream2_get_be16(&gb); country_code = itut_t35->country_code; - if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_ATSC) { - uint32_t user_identifier = bytestream2_get_be32(&gb); - switch (user_identifier) { - case MKBETAG('G', 'A', '9', '4'): { // closed captions - AVBufferRef *buf = NULL; + switch (country_code) { + case ITU_T_T35_COUNTRY_CODE_US: + provider_code = bytestream2_get_be16u(&gb); - res = ff_parse_a53_cc(&buf, gb.buffer, bytestream2_get_bytes_left(&gb)); - if (res < 0) - return res; - if (!res) - return 0; // no cc found, ignore + switch (provider_code) { + case ITU_T_T35_PROVIDER_CODE_ATSC: { + uint32_t user_identifier = bytestream2_get_be32(&gb); + switch (user_identifier) { + case MKBETAG('G', 'A', '9', '4'): { // closed captions + AVBufferRef *buf = NULL; - res = ff_frame_new_side_data_from_buf(c, frame, AV_FRAME_DATA_A53_CC, &buf); - if (res < 0) - return res; + res = ff_parse_a53_cc(&buf, gb.buffer, bytestream2_get_bytes_left(&gb)); + if (res < 0) + return res; + if (!res) + return 0; // no cc found, ignore + + res = ff_frame_new_side_data_from_buf(c, frame, AV_FRAME_DATA_A53_CC, &buf); + if (res < 0) + return res; #if FF_API_CODEC_PROPS FF_DISABLE_DEPRECATION_WARNINGS - c->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; + c->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; FF_ENABLE_DEPRECATION_WARNINGS #endif + break; + } + default: // ignore unsupported identifiers + break; + } break; } - default: // ignore unsupported identifiers + case ITU_T_T35_PROVIDER_CODE_SAMSUNG: { + AVDynamicHDRPlus *hdrplus; + int provider_oriented_code = bytestream2_get_be16(&gb); + int application_identifier = bytestream2_get_byte(&gb); + + if (provider_oriented_code != 1 || application_identifier != 4) + return 0; // ignore + + hdrplus = av_dynamic_hdr_plus_create_side_data(frame); + if (!hdrplus) + return AVERROR(ENOMEM); + + res = av_dynamic_hdr_plus_from_t35(hdrplus, gb.buffer, + bytestream2_get_bytes_left(&gb)); + if (res < 0) + return res; break; } - } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SAMSUNG) { - AVDynamicHDRPlus *hdrplus; - int provider_oriented_code = bytestream2_get_be16(&gb); - int application_identifier = bytestream2_get_byte(&gb); + case ITU_T_T35_PROVIDER_CODE_DOLBY: { + int provider_oriented_code = bytestream2_get_be32(&gb); + if (provider_oriented_code != 0x800) + return 0; // ignore - if (provider_oriented_code != 1 || application_identifier != 4) - return 0; // ignore + res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, bytestream2_get_bytes_left(&gb), + c->err_recognition); + if (res < 0) { + av_log(c, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); + return 0; // ignore + } - hdrplus = av_dynamic_hdr_plus_create_side_data(frame); - if (!hdrplus) - return AVERROR(ENOMEM); - - res = av_dynamic_hdr_plus_from_t35(hdrplus, gb.buffer, - bytestream2_get_bytes_left(&gb)); - if (res < 0) - return res; - } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_DOLBY) { - int provider_oriented_code = bytestream2_get_be32(&gb); - if (provider_oriented_code != 0x800) - return 0; // ignore - - res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, bytestream2_get_bytes_left(&gb), - c->err_recognition); - if (res < 0) { - av_log(c, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); - return 0; // ignore + res = ff_dovi_attach_side_data(&dav1d->dovi, frame); + if (res < 0) + return res; + break; } - - res = ff_dovi_attach_side_data(&dav1d->dovi, frame); - if (res < 0) - return res; - } else { + default: + break; + } + break; + default: // ignore unsupported provider codes + break; } return 0; } -- 2.52.0 >From 70fc5501bd2b437f6d2da01d7493fcddbb3f22c1 Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Thu, 26 Mar 2026 17:24:46 -0300 Subject: [PATCH 4/6] avcodec/libdav1d: add support for LCEVC ITU-T35 payloads Signed-off-by: James Almer <[email protected]> --- libavcodec/libdav1d.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 77520744cd..9a9878def2 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -443,6 +443,31 @@ FF_ENABLE_DEPRECATION_WARNINGS break; } break; + case ITU_T_T35_COUNTRY_CODE_UK: + bytestream2_skipu(&gb, 1); // t35_uk_country_code_second_octet + if (bytestream2_get_bytes_left(&gb) < 2) + return AVERROR_INVALIDDATA; + + provider_code = bytestream2_get_be16u(&gb); + switch (provider_code) { + case ITU_T_T35_PROVIDER_CODE_VNOVA: { + AVFrameSideData *sd; + if (bytestream2_get_bytes_left(&gb) < 2) + return AVERROR_INVALIDDATA; + + res = ff_frame_new_side_data(c, frame, AV_FRAME_DATA_LCEVC, + bytestream2_get_bytes_left(&gb), &sd); + if (res < 0) + return res; + + bytestream2_get_bufferu(&gb, sd->data, sd->size); + break; + } + default: + break; + } + break; + default: // ignore unsupported provider codes break; -- 2.52.0 >From 68241cfb33165caccc8ae843f8bd586f57f9defa Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Thu, 26 Mar 2026 17:29:41 -0300 Subject: [PATCH 5/6] avcodec/av1dec: refactor parsing ITU-T35 metadata Use a switch case. Will be useful in the following commit. Signed-off-by: James Almer <[email protected]> --- libavcodec/av1dec.c | 105 +++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 45 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index ba8442077a..60c2794008 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -973,67 +973,82 @@ static int export_itut_t35(AVCodecContext *avctx, AVFrame *frame, bytestream2_init(&gb, itut_t35->payload, itut_t35->payload_size); - provider_code = bytestream2_get_be16(&gb); country_code = itut_t35->itu_t_t35_country_code ; - if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_ATSC) { - uint32_t user_identifier = bytestream2_get_be32(&gb); - switch (user_identifier) { - case MKBETAG('G', 'A', '9', '4'): { // closed captions - AVBufferRef *buf = NULL; + switch (country_code) { + case ITU_T_T35_COUNTRY_CODE_US: + provider_code = bytestream2_get_be16(&gb); - ret = ff_parse_a53_cc(&buf, gb.buffer, bytestream2_get_bytes_left(&gb)); - if (ret < 0) - return ret; - if (!ret) - break; + switch (provider_code) { + case ITU_T_T35_PROVIDER_CODE_ATSC: { + uint32_t user_identifier = bytestream2_get_be32(&gb); + switch (user_identifier) { + case MKBETAG('G', 'A', '9', '4'): { // closed captions + AVBufferRef *buf = NULL; - ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &buf); - if (ret < 0) - return ret; + ret = ff_parse_a53_cc(&buf, gb.buffer, bytestream2_get_bytes_left(&gb)); + if (ret < 0) + return ret; + if (!ret) + break; + + ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &buf); + if (ret < 0) + return ret; #if FF_API_CODEC_PROPS FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; + avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; FF_ENABLE_DEPRECATION_WARNINGS #endif + break; + } + default: // ignore unsupported identifiers + break; + } break; } - default: // ignore unsupported identifiers + case ITU_T_T35_PROVIDER_CODE_SAMSUNG: { + AVDynamicHDRPlus *hdrplus; + int provider_oriented_code = bytestream2_get_be16(&gb); + int application_identifier = bytestream2_get_byte(&gb); + + if (provider_oriented_code != 1 || application_identifier != 4) + return 0; // ignore + + hdrplus = av_dynamic_hdr_plus_create_side_data(frame); + if (!hdrplus) + return AVERROR(ENOMEM); + + ret = av_dynamic_hdr_plus_from_t35(hdrplus, gb.buffer, + bytestream2_get_bytes_left(&gb)); + if (ret < 0) + return ret; break; } - } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SAMSUNG) { - AVDynamicHDRPlus *hdrplus; - int provider_oriented_code = bytestream2_get_be16(&gb); - int application_identifier = bytestream2_get_byte(&gb); + case ITU_T_T35_PROVIDER_CODE_DOLBY: { + int provider_oriented_code = bytestream2_get_be32(&gb); + if (provider_oriented_code != 0x800) + return 0; // ignore - if (provider_oriented_code != 1 || application_identifier != 4) - return 0; // ignore + ret = ff_dovi_rpu_parse(&s->dovi, gb.buffer, bytestream2_get_bytes_left(&gb), + avctx->err_recognition); + if (ret < 0) { + av_log(avctx, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); + return 0; // ignore + } - hdrplus = av_dynamic_hdr_plus_create_side_data(frame); - if (!hdrplus) - return AVERROR(ENOMEM); - - ret = av_dynamic_hdr_plus_from_t35(hdrplus, gb.buffer, - bytestream2_get_bytes_left(&gb)); - if (ret < 0) - return ret; - } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_DOLBY) { - int provider_oriented_code = bytestream2_get_be32(&gb); - if (provider_oriented_code != 0x800) - return 0; // ignore - - ret = ff_dovi_rpu_parse(&s->dovi, gb.buffer, bytestream2_get_bytes_left(&gb), - avctx->err_recognition); - if (ret < 0) { - av_log(avctx, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); - return 0; // ignore + ret = ff_dovi_attach_side_data(&s->dovi, frame); + if (ret < 0) + return ret; + break; } - - ret = ff_dovi_attach_side_data(&s->dovi, frame); - if (ret < 0) - return ret; - } else { + default: + break; + } + break; + default: // ignore unsupported provider codes + break; } return 0; -- 2.52.0 >From 0c701afd4c869afb21bce59d36f790a409258d1a Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Thu, 26 Mar 2026 17:32:03 -0300 Subject: [PATCH 6/6] avcodec/av1dec: add support for LCEVC ITU-T35 payloads Signed-off-by: James Almer <[email protected]> --- libavcodec/av1dec.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 60c2794008..1635cbea54 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1046,6 +1046,28 @@ FF_ENABLE_DEPRECATION_WARNINGS break; } break; + case ITU_T_T35_COUNTRY_CODE_UK: + bytestream2_skip(&gb, 1); // t35_uk_country_code_second_octet + + provider_code = bytestream2_get_be16(&gb); + switch (provider_code) { + case ITU_T_T35_PROVIDER_CODE_VNOVA: { + AVFrameSideData *sd; + if (bytestream2_get_bytes_left(&gb) < 2) + return AVERROR_INVALIDDATA; + + ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_LCEVC, + bytestream2_get_bytes_left(&gb), &sd); + if (ret < 0) + return ret; + + bytestream2_get_bufferu(&gb, sd->data, sd->size); + break; + } + default: + break; + } + break; default: // ignore unsupported provider codes break; -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
