July 2025 - ffmpeg-devel - lists.ffmpeg.org

[PATCH v3] ffprobe: add -codec:<media_spec> option
by Maryla Ustarroz-Calonge 31 Jul '25

31 Jul '25

And -c:<media_spec> variant. Update ffprobe.texi. opt_codec() is mostly copied over from ffplay.c This is useful when different decoders have different capabilities, or to test a specific decoder. Signed-off-by: Maryla Ustarroz-Calonge <maryla(a)google.com> --- Changelog | 2 +- doc/ffprobe.texi | 6 +++ fftools/ffprobe.c | 117 +++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 112 insertions(+), 13 deletions(-) diff --git a/Changelog b/Changelog index 4217449438..ae73611222 100644 --- a/Changelog +++ b/Changelog @@ -18,7 +18,7 @@ version <next>: - APV encoding support through a libopenapv wrapper - VVC decoder supports all content of SCC (Screen Content Coding): IBC (Inter Block Copy), Palette Mode and ACT (Adaptive Color Transform - +- ffprobe -codec option version 7.1: - Raw Captions with Time (RCWT) closed caption demuxer diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 8834df8d35..3be359f07a 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -368,6 +368,12 @@ Read @var{input_url}. Write output to @var{output_url}. If not specified, the output is sent to stdout. +@item -c:@var{media_specifier} @var{codec_name} +@itemx -codec:@var{media_specifier} @var{codec_name} +Force a specific decoder implementation for the stream identified by +@var{media_specifier}, which can assume the values @code{a} (audio), +@code{v} (video), @code{s} (subtitle), and @code{d} (data). + @end table @c man end diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 1346ed33c5..3c4006e0d3 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -36,6 +36,7 @@ #include "libavutil/ambient_viewing_environment.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" @@ -130,6 +131,11 @@ static int use_byte_value_binary_prefix = 0; static int use_value_sexagesimal_format = 0; static int show_private_data = 1; +static const char *audio_codec_name = NULL; +static const char *data_codec_name = NULL; +static const char *subtitle_codec_name = NULL; +static const char *video_codec_name = NULL; + #define SHOW_OPTIONAL_FIELDS_AUTO -1 #define SHOW_OPTIONAL_FIELDS_NEVER 0 #define SHOW_OPTIONAL_FIELDS_ALWAYS 1 @@ -2284,6 +2290,64 @@ static void show_error(AVTextFormatContext *tfc, int err) avtext_print_section_footer(tfc); } +static int get_decoder_by_name(const char *codec_name, const AVCodec **codec) +{ + if (codec_name == NULL) + return 0; + + *codec = avcodec_find_decoder_by_name(codec_name); + if (*codec == NULL) { + av_log(NULL, AV_LOG_ERROR, + "No codec could be found with name '%s'\n", codec_name); + return AVERROR(EINVAL); + } + return 0; +} + +#define GET_DECODER(type_) \ + ret = get_decoder_by_name(type_##_codec_name, &fmt_ctx->type_##_codec); \ + if (ret < 0) return ret; + +static int set_decoders(AVFormatContext *fmt_ctx) +{ + int ret; + GET_DECODER(audio); + GET_DECODER(data); + GET_DECODER(subtitle); + GET_DECODER(video); + return 0; +} + +static const AVCodec *get_decoder_for_stream(AVFormatContext *fmt_ctx, AVStream *stream) +{ + const AVCodec *codec = NULL; + switch (stream->codecpar->codec_type) { + case AVMEDIA_TYPE_VIDEO: codec = fmt_ctx->video_codec; break; + case AVMEDIA_TYPE_AUDIO: codec = fmt_ctx->audio_codec; break; + case AVMEDIA_TYPE_SUBTITLE: codec = fmt_ctx->subtitle_codec; break; + case AVMEDIA_TYPE_DATA: codec = fmt_ctx->data_codec; break; + } + + if (codec != NULL) + return codec; + + if (stream->codecpar->codec_id == AV_CODEC_ID_PROBE) { + av_log(NULL, AV_LOG_WARNING, + "Failed to probe codec for input stream %d\n", stream->index); + return NULL; + } + + codec = avcodec_find_decoder(stream->codecpar->codec_id); + if (codec == NULL) { + av_log(NULL, AV_LOG_WARNING, + "Unsupported codec with id %d for input stream %d\n", + stream->codecpar->codec_id, stream->index); + return NULL; + } + + return codec; +} + static int open_input_file(InputFile *ifile, const char *filename, const char *print_filename) { @@ -2296,6 +2360,9 @@ static int open_input_file(InputFile *ifile, const char *filename, if (!fmt_ctx) return AVERROR(ENOMEM); + err = set_decoders(fmt_ctx); + if (err < 0) + return err; if (!av_dict_get(format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE)) { av_dict_set(&format_opts, "scan_all_pmts", "1", AV_DICT_DONT_OVERWRITE); scan_all_pmts_set = 1; @@ -2350,20 +2417,10 @@ static int open_input_file(InputFile *ifile, const char *filename, ist->st = stream; - if (stream->codecpar->codec_id == AV_CODEC_ID_PROBE) { - av_log(NULL, AV_LOG_WARNING, - "Failed to probe codec for input stream %d\n", - stream->index); + codec = get_decoder_for_stream(fmt_ctx, stream); + if (!codec) continue; - } - codec = avcodec_find_decoder(stream->codecpar->codec_id); - if (!codec) { - av_log(NULL, AV_LOG_WARNING, - "Unsupported codec with id %d for input stream %d\n", - stream->codecpar->codec_id, stream->index); - continue; - } { AVDictionary *opts; @@ -2510,6 +2567,10 @@ end: av_freep(&selected_streams); av_freep(&streams_with_closed_captions); av_freep(&streams_with_film_grain); + av_freep(&audio_codec_name); + av_freep(&data_codec_name); + av_freep(&subtitle_codec_name); + av_freep(&video_codec_name); return ret; } @@ -2964,6 +3025,36 @@ static int opt_sections(void *optctx, const char *opt, const char *arg) return 0; } +static int opt_codec(void *optctx, const char *opt, const char *arg) +{ + const char *spec = strchr(opt, ':'); + const char **name; + if (!spec) { + av_log(NULL, AV_LOG_ERROR, + "No media specifier was specified for '%s' in option '%s'. Use -%s:<media_spec> " + "where <media_spec> can be one of: 'a' (audio), 'v' (video), 's' (subtitle), 'd' (data)\n", + arg, opt, opt); + return AVERROR(EINVAL); + } + spec++; + + switch (spec[0]) { + case 'a' : name = &audio_codec_name; break; + case 'd' : name = &data_codec_name; break; + case 's' : name = &subtitle_codec_name; break; + case 'v' : name = &video_codec_name; break; + default: + av_log(NULL, AV_LOG_ERROR, + "Invalid media specifier '%s' in option '%s'. " + "Must be one of: 'a' (audio), 'v' (video), 's' (subtitle), 'd' (data)\n", spec, opt); + return AVERROR(EINVAL); + } + + av_freep(name); + *name = av_strdup(arg); + return *name ? 0 : AVERROR(ENOMEM); +} + static int opt_show_versions(void *optctx, const char *opt, const char *arg) { mark_section_show_entries(SECTION_ID_PROGRAM_VERSION, 1, NULL); @@ -3039,6 +3130,8 @@ static const OptionDef real_options[] = { { "print_filename", OPT_TYPE_FUNC, OPT_FUNC_ARG, {.func_arg = opt_print_filename}, "override the printed input filename", "print_file"}, { "find_stream_info", OPT_TYPE_BOOL, OPT_INPUT | OPT_EXPERT, { &find_stream_info }, "read and decode the streams to fill missing information with heuristics" }, + { "c", OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_codec}, "force decoder", "decoder_name" }, + { "codec", OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_codec}, "alias for -c (force decoder)", "decoder_name" }, { NULL, }, }; -- 2.50.1.552.g942d659e1b-goog

1 0

Re: [FFmpeg-devel] [PATCH 1/1] add option in file.c: pkt_size toset max_packet_size
by Gyan Doshi 31 Jul '25

31 Jul '25

On 2025-07-31 01:06 pm, 1+1=10 wrote: > If max_packet_size is -1, a crash will occur in the ffio_fdopen function due to malloc(-1), > but max_packet_size is initialized to 0 in the url_alloc_for_protocol function. > If it is not customized to -1, this situation should not occur. But your added option allows the user to set it to an invalid value. Rectify that. Regards, Gyan

1 0

[PATCH v2] libavformat/img2enc.c: rm warning ‘.tmp’ directive output may be truncated
by caifan0425 31 Jul '25

31 Jul '25

Signed-off-by: Cai Fan <caifan0425(a)163.com>--- libavformat/img2enc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 41638d92b8..a1eb0c688d 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -180,7 +180,12 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) } for (i = 0; i < 4; i++) { av_dict_copy(&options, img->protocol_opts, 0); - snprintf(img->temp[i], sizeof(img->tmp[i]), "%s.tmp", filename); + int len = snprintf(img->tmp[i], sizeof(img->tmp[i]), "%s.tmp", filename); + if (len < 0 || len >= sizeof(img->tmp[i])) { + av_log(s, AV_LOG_ERROR, "filename '%s' exceeds buffer size %zu\n", filename, sizeof(img->tmp[i])); + ret = AVERROR(EINVAL); + goto fail; + } av_strlcpy(img->target[i], filename, sizeof(img->target[i])); if (s->io_open(s, &pb[i], img->use_rename ? img->tmp[i] : filename, AVIO_FLAG_WRITE, &options) < 0) { av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", img->use_rename ? img->tmp[i] : filename); -- > On Jul 31, 2025, at 10:13, Cai Fan <caifan0425(a)163.com> wrote: > > Signed-off-by: Cai Fan <caifan0425(a)163.com> > --- > libavformat/img2enc.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c > index 41638d92b8..a1eb0c688d 100644 > --- a/libavformat/img2enc.c > +++ b/libavformat/img2enc.c > @@ -180,7 +180,12 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) > } > for (i = 0; i < 4; i++) { > av_dict_copy(&options, img->protocol_opts, 0); > - snprintf(img->tmp[i], sizeof(img->tmp[i]), "%s.tmp", filename); > + int len = snprintf(img->tmp[i], sizeof(img->tmp[i]), "%s.tmp", filename); > + if (len < 0 || len >= sizeof(img->tmp[i])) { > + av_log(s, AV_LOG_ERROR, "Filename too long: %s\n", filename); “filename exceeds buffer size %zu\n”. > + ret = AVERROR(EINVAL); > + goto fail; > + } > av_strlcpy(img->target[i], filename, sizeof(img->target[i])); > if (s->io_open(s, &pb[i], img->use_rename ? img->tmp[i] : filename, AVIO_FLAG_WRITE, &options) < 0) { > av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", img->use_rename ? img->tmp[i] : filename); > -- > 2.34.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel(a)ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request(a)ffmpeg.org with subject "unsubscribe".

1 0

[PATCH 1/1] libavformat/mov.c: Fix "statement will never be executed" warning
by zhaozhenghang 31 Jul '25

31 Jul '25

Fix "statement will never be executed" warning that occurs when CONFIG_H261_DECODER, CONFIG_H263_DECODER, and CONFIG_MPEG4_DECODER are set to 0 by default. Signed-off-by: zhaozhenghang <15083277223(a)163.com> --- libavformat/mov.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 55b0950b5e..5ff9b5ba1b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5225,18 +5225,14 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) } switch (st->codecpar->codec_id) { -#if CONFIG_H261_DECODER case AV_CODEC_ID_H261: -#endif -#if CONFIG_H263_DECODER case AV_CODEC_ID_H263: -#endif -#if CONFIG_MPEG4_DECODER case AV_CODEC_ID_MPEG4: -#endif st->codecpar->width = 0; /* let decoder init width/height */ st->codecpar->height= 0; break; + default: + break; } // If the duration of the mp3 packets is not constant, then they could need a parser -- 2.50.1.windows.1

2 1

[PATCH] avformat/subfile: clip seek offset
by Kacper Michajłow 30 Jul '25

30 Jul '25

Fixes: signed integer overflow: 9223372036854737920 + 1649410 cannot be represented in type 'int64_t' Fixes OSS-Fuzz: 410100610 Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> --- libavformat/subfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/subfile.c b/libavformat/subfile.c index be48ef72ef..b8c6ce0eef 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -128,13 +128,13 @@ static int64_t subfile_seek(URLContext *h, int64_t pos, int whence) case AVSEEK_SIZE: return end - c->start; case SEEK_SET: - new_pos = c->start + pos; + new_pos = c->start + av_clip(pos, 0, end - c->start); break; case SEEK_CUR: - new_pos = c->pos + pos; + new_pos = c->pos + av_clip(pos, -(c->pos - c->start), end - c->pos); break; case SEEK_END: - new_pos = end + pos; + new_pos = end + av_clip(pos, -(end - c->start), 0); break; default: av_assert0(0); -- 2.47.2

5 9

Re: [FFmpeg-devel] [PATCH] ffprobe: add -codec:<media_spec> option
by Stefano Sabatini 30 Jul '25

30 Jul '25

Hi, sorry for the slow reply. On date Tuesday 2025-06-10 17:02:05 +0200, ffmpeg-devel Mailing List wrote: > From: Maryla Ustarroz-Calonge <maryla(a)google.com> > Subject: [PATCH] ffprobe: add -codec:<media_spec> option > Date: Tue, 10 Jun 2025 17:02:05 +0200 > To: ffmpeg-devel(a)ffmpeg.org > X-Mailer: git-send-email 2.50.0.rc1.591.g9c95f17f64-goog > > opt_codec() is mostly copied over from ffplay.c > > Signed-off-by: Maryla Ustarroz-Calonge <maryla(a)google.com> > --- > Changelog | 2 +- > fftools/ffprobe.c | 114 +++++++++++++++++++++++++++++++++++++++++----- > 2 files changed, 103 insertions(+), 13 deletions(-) > > diff --git a/Changelog b/Changelog > index 4217449438..ae73611222 100644 > --- a/Changelog > +++ b/Changelog > @@ -18,7 +18,7 @@ version <next>: > - APV encoding support through a libopenapv wrapper > - VVC decoder supports all content of SCC (Screen Content Coding): > IBC (Inter Block Copy), Palette Mode and ACT (Adaptive Color Transform > - > +- ffprobe -codec option > > version 7.1: > - Raw Captions with Time (RCWT) closed caption demuxer > diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c > index 1346ed33c5..0124ce114c 100644 > --- a/fftools/ffprobe.c > +++ b/fftools/ffprobe.c > @@ -36,6 +36,7 @@ > #include "libavutil/ambient_viewing_environment.h" > #include "libavutil/avassert.h" > #include "libavutil/avstring.h" > +#include "libavutil/avutil.h" > #include "libavutil/bprint.h" > #include "libavutil/channel_layout.h" > #include "libavutil/display.h" > @@ -130,6 +131,11 @@ static int use_byte_value_binary_prefix = 0; > static int use_value_sexagesimal_format = 0; > static int show_private_data = 1; > > +static const char *audio_codec_name = NULL; > +static const char *data_codec_name = NULL; > +static const char *subtitle_codec_name = NULL; > +static const char *video_codec_name = NULL; > + > #define SHOW_OPTIONAL_FIELDS_AUTO -1 > #define SHOW_OPTIONAL_FIELDS_NEVER 0 > #define SHOW_OPTIONAL_FIELDS_ALWAYS 1 > @@ -2284,6 +2290,64 @@ static void show_error(AVTextFormatContext *tfc, int err) > avtext_print_section_footer(tfc); > } > > +static int get_decoder_by_name(const char *codec_name, const AVCodec **codec) > +{ > + if (codec_name == NULL) > + return 0; > + > + *codec = avcodec_find_decoder_by_name(codec_name); > + if (*codec == NULL) { > + av_log(NULL, AV_LOG_ERROR, > + "No codec could be found with name '%s'\n", codec_name); > + return AVERROR(EINVAL);; nit: drop duplicated ; > + } > + return 0; > +} > + > +static int set_decoders(AVFormatContext *fmt_ctx) > +{ > + int ret; > + ret = get_decoder_by_name(audio_codec_name, &fmt_ctx->audio_codec); > + if (ret < 0) return ret; > + ret = get_decoder_by_name(data_codec_name, &fmt_ctx->data_codec); > + if (ret < 0) return ret; > + ret = get_decoder_by_name(subtitle_codec_name, &fmt_ctx->subtitle_codec); > + if (ret < 0) return ret; > + ret = get_decoder_by_name(video_codec_name, &fmt_ctx->video_codec); > + if (ret < 0) return ret; > + return 0; > +} > + > +static const AVCodec *get_decoder_for_stream(AVFormatContext *fmt_ctx, AVStream *stream) > +{ > + const AVCodec *codec = NULL; > + switch (stream->codecpar->codec_type) { > + case AVMEDIA_TYPE_VIDEO: codec = fmt_ctx->video_codec; break; > + case AVMEDIA_TYPE_AUDIO: codec = fmt_ctx->audio_codec; break; > + case AVMEDIA_TYPE_SUBTITLE: codec = fmt_ctx->subtitle_codec; break; > + case AVMEDIA_TYPE_DATA: codec = fmt_ctx->data_codec; break; > + } > + > + if (codec != NULL) > + return codec; > + > + if (stream->codecpar->codec_id == AV_CODEC_ID_PROBE) { > + av_log(NULL, AV_LOG_WARNING, > + "Failed to probe codec for input stream %d\n", stream->index); > + return NULL; > + } > + > + codec = avcodec_find_decoder(stream->codecpar->codec_id); > + if (codec == NULL) { > + av_log(NULL, AV_LOG_WARNING, > + "Unsupported codec with id %d for input stream %d\n", > + stream->codecpar->codec_id, stream->index); > + return NULL; > + } > + > + return codec; > +} > + > static int open_input_file(InputFile *ifile, const char *filename, > const char *print_filename) > { > @@ -2296,6 +2360,9 @@ static int open_input_file(InputFile *ifile, const char *filename, > if (!fmt_ctx) > return AVERROR(ENOMEM); > > + err = set_decoders(fmt_ctx); > + if (err < 0) > + return err; > if (!av_dict_get(format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE)) { > av_dict_set(&format_opts, "scan_all_pmts", "1", AV_DICT_DONT_OVERWRITE); > scan_all_pmts_set = 1; > @@ -2350,20 +2417,10 @@ static int open_input_file(InputFile *ifile, const char *filename, > > ist->st = stream; > > - if (stream->codecpar->codec_id == AV_CODEC_ID_PROBE) { > - av_log(NULL, AV_LOG_WARNING, > - "Failed to probe codec for input stream %d\n", > - stream->index); > + codec = get_decoder_for_stream(fmt_ctx, stream); > + if (!codec) > continue; > - } > > - codec = avcodec_find_decoder(stream->codecpar->codec_id); > - if (!codec) { > - av_log(NULL, AV_LOG_WARNING, > - "Unsupported codec with id %d for input stream %d\n", > - stream->codecpar->codec_id, stream->index); > - continue; > - } > { > AVDictionary *opts; > > @@ -2510,6 +2567,10 @@ end: > av_freep(&selected_streams); > av_freep(&streams_with_closed_captions); > av_freep(&streams_with_film_grain); > + av_freep(&audio_codec_name); > + av_freep(&data_codec_name); > + av_freep(&subtitle_codec_name); > + av_freep(&video_codec_name); > > return ret; > } > @@ -2964,6 +3025,34 @@ static int opt_sections(void *optctx, const char *opt, const char *arg) > return 0; > } > > +static int opt_codec(void *optctx, const char *opt, const char *arg) > +{ > + const char *spec = strchr(opt, ':'); > + const char **name; > + if (!spec) { > + av_log(NULL, AV_LOG_ERROR, > + "No media specifier was specified for '%s' in option '%s'. Use -%s:<media_spec>\n", > + arg, opt, opt); > + return AVERROR(EINVAL); > + } > + spec++; > + > + switch (spec[0]) { > + case 'a' : name = &audio_codec_name; break; > + case 'd' : name = &data_codec_name; break; > + case 's' : name = &subtitle_codec_name; break; > + case 'v' : name = &video_codec_name; break; > + default: > + av_log(NULL, AV_LOG_ERROR, > + "Invalid media specifier '%s' in option '%s'. Must be one of: v, a, s, d\n", spec, opt); > + return AVERROR(EINVAL); > + } > + > + av_freep(name); > + *name = av_strdup(arg); > + return *name ? 0 : AVERROR(ENOMEM); > +} > + Not super happy that this is duplicated but I see no sane way to factorize it. > static int opt_show_versions(void *optctx, const char *opt, const char *arg) > { > mark_section_show_entries(SECTION_ID_PROGRAM_VERSION, 1, NULL); > @@ -3039,6 +3128,7 @@ static const OptionDef real_options[] = { > { "print_filename", OPT_TYPE_FUNC, OPT_FUNC_ARG, {.func_arg = opt_print_filename}, "override the printed input filename", "print_file"}, > { "find_stream_info", OPT_TYPE_BOOL, OPT_INPUT | OPT_EXPERT, { &find_stream_info }, > "read and decode the streams to fill missing information with heuristics" }, > + { "codec", OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_codec}, "force decoder", "decoder_name" }, > { NULL, }, > }; Please also add an update for the docs and a short explanation of the use case in the commit log. Thanks.

2 2

[PATCH v2] avcodec/itut35: always check the provider code and country code together
by Maryla Ustarroz-Calonge 30 Jul '25

30 Jul '25

From: Maryla <maryla(a)google.com> ITU-T T.35 provider codes are attributed by national bodies and it's possible to have collisions across countries. This is why the country code must always be checked as well. Use if statements rather than nested switches which would be unreadable. Rename some of the constants to match the corresponding organization. Add a constant for AOM. Write all constants with 4 hex digits to make it clear that they are 2-byte ids. The code for V-Nova should be 0x5000 instead of 0x0050 according to the UK Register of Manufacturer Codes https://www.cix.co.uk/~bpechey/H221/h221code.htm but I have been unable to find any reference for what code should be used for LCEVC, and the author of the original change has not replied to my emails. Signed-off-by: Maryla Ustarroz-Calonge <maryla(a)google.com> --- libavcodec/av1dec.c | 32 +++----- libavcodec/h2645_sei.c | 36 +++------ libavcodec/itut35.h | 21 ++++-- libavcodec/libdav1d.c | 154 +++++++++++++++++++------------------- libavformat/matroskadec.c | 2 +- libavformat/matroskaenc.c | 2 +- 6 files changed, 116 insertions(+), 131 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 8ff1bf394c..be595484d1 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -965,13 +965,13 @@ static int export_itut_t35(AVCodecContext *avctx, AVFrame *frame, { GetByteContext gb; AV1DecContext *s = avctx->priv_data; - int ret, provider_code; + int ret, provider_code, country_code; bytestream2_init(&gb, itut_t35->payload, itut_t35->payload_size); provider_code = bytestream2_get_be16(&gb); - switch (provider_code) { - case ITU_T_T35_PROVIDER_CODE_ATSC: { + 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 @@ -997,16 +997,13 @@ FF_ENABLE_DEPRECATION_WARNINGS default: // ignore unsupported identifiers break; } - break; - } - case ITU_T_T35_PROVIDER_CODE_SMTPE: { + } 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); - if (itut_t35->itu_t_t35_country_code != ITU_T_T35_COUNTRY_CODE_US || - provider_oriented_code != 1 || application_identifier != 4) - break; + if (provider_oriented_code != 1 || application_identifier != 4) + return 0; // ignore hdrplus = av_dynamic_hdr_plus_create_side_data(frame); if (!hdrplus) @@ -1016,28 +1013,23 @@ FF_ENABLE_DEPRECATION_WARNINGS bytestream2_get_bytes_left(&gb)); if (ret < 0) return ret; - break; - } - case ITU_T_T35_PROVIDER_CODE_DOLBY: { + } 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 (itut_t35->itu_t_t35_country_code != ITU_T_T35_COUNTRY_CODE_US || - provider_oriented_code != 0x800) - break; + if (provider_oriented_code != 0x800) + return 0; // ignore ret = ff_dovi_rpu_parse(&s->dovi, gb.buffer, gb.buffer_end - gb.buffer, avctx->err_recognition); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); - break; // ignore + return 0; // ignore } ret = ff_dovi_attach_side_data(&s->dovi, frame); if (ret < 0) return ret; - break; - } - default: // ignore unsupported provider codes - break; + } else { + // ignore unsupported provider codes } return 0; diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index d17c4fb5f9..04432b6a8d 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -158,20 +158,10 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, bytestream2_skipu(gb, 1); // itu_t_t35_country_code_extension_byte } - if (country_code != ITU_T_T35_COUNTRY_CODE_US && - country_code != ITU_T_T35_COUNTRY_CODE_UK && - country_code != ITU_T_T35_COUNTRY_CODE_CN) { - av_log(logctx, AV_LOG_VERBOSE, - "Unsupported User Data Registered ITU-T T35 SEI message (country_code = %d)\n", - country_code); - return 0; - } - /* itu_t_t35_payload_byte follows */ provider_code = bytestream2_get_be16u(gb); - switch (provider_code) { - case ITU_T_T35_PROVIDER_CODE_ATSC: { + if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_ATSC) { uint32_t user_identifier; if (bytestream2_get_bytes_left(gb) < 4) @@ -189,9 +179,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, user_identifier); break; } - break; - } - case ITU_T_T35_PROVIDER_CODE_LCEVC: { + } else if (country_code == ITU_T_T35_COUNTRY_CODE_UK && provider_code == ITU_T_T35_PROVIDER_CODE_VNOVA) { if (bytestream2_get_bytes_left(gb) < 2) return AVERROR_INVALIDDATA; @@ -199,7 +187,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, return decode_registered_user_data_lcevc(&h->lcevc, gb); } #if CONFIG_HEVC_SEI - case ITU_T_T35_PROVIDER_CODE_CUVA: { + else if (country_code == ITU_T_T35_COUNTRY_CODE_CN && provider_code == ITU_T_T35_PROVIDER_CODE_HDR_VIVID) { const uint16_t cuva_provider_oriented_code = 0x0005; uint16_t provider_oriented_code; @@ -213,9 +201,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, if (provider_oriented_code == cuva_provider_oriented_code) { return decode_registered_user_data_dynamic_hdr_vivid(&h->dynamic_hdr_vivid, gb); } - break; - } - case ITU_T_T35_PROVIDER_CODE_SMTPE: { + } else if(country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SAMSUNG) { // A/341 Amendment - 2094-40 const uint16_t smpte2094_40_provider_oriented_code = 0x0001; const uint8_t smpte2094_40_application_identifier = 0x04; @@ -234,9 +220,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, application_identifier == smpte2094_40_application_identifier) { return decode_registered_user_data_dynamic_hdr_plus(&h->dynamic_hdr_plus, gb); } - break; - } - case 0x5890: { // aom_provider_code + } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_AOM) { const uint16_t aom_grain_provider_oriented_code = 0x0001; uint16_t provider_oriented_code; @@ -252,15 +236,13 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, gb->buffer, bytestream2_get_bytes_left(gb)); } - break; } - unsupported_provider_code: #endif - default: + else { + unsupported_provider_code: av_log(logctx, AV_LOG_VERBOSE, - "Unsupported User Data Registered ITU-T T35 SEI message (provider_code = %d)\n", - provider_code); - break; + "Unsupported User Data Registered ITU-T T35 SEI message (country_code = %d, provider_code = %d)\n", + country_code, provider_code); } return 0; diff --git a/libavcodec/itut35.h b/libavcodec/itut35.h index a75ef37929..b8987d0b01 100644 --- a/libavcodec/itut35.h +++ b/libavcodec/itut35.h @@ -23,10 +23,21 @@ #define ITU_T_T35_COUNTRY_CODE_UK 0xB4 #define ITU_T_T35_COUNTRY_CODE_US 0xB5 -#define ITU_T_T35_PROVIDER_CODE_ATSC 0x31 -#define ITU_T_T35_PROVIDER_CODE_CUVA 0x04 -#define ITU_T_T35_PROVIDER_CODE_DOLBY 0x3B -#define ITU_T_T35_PROVIDER_CODE_LCEVC 0x50 -#define ITU_T_T35_PROVIDER_CODE_SMTPE 0x3C +// The Terminal Provider Code (or "Manufacturer Code") identifies the +// manufacturer within a country. An Assignment Authority appointed by the +// national body assigns this code nationally. The manufacturer code is always +// used in conjunction with a country code. +// - CN providers +#define ITU_T_T35_PROVIDER_CODE_HDR_VIVID 0x0004 +// - UK providers +// V-Nova should be 0x5000 according to UK Register of Manufacturer Codes +// https://www.cix.co.uk/~bpechey/H221/h221code.htm +// but FFmpeg has been using 0x0050 +#define ITU_T_T35_PROVIDER_CODE_VNOVA 0x0050 +// - US providers +#define ITU_T_T35_PROVIDER_CODE_ATSC 0x0031 +#define ITU_T_T35_PROVIDER_CODE_DOLBY 0x003B +#define ITU_T_T35_PROVIDER_CODE_AOM 0x5890 +#define ITU_T_T35_PROVIDER_CODE_SAMSUNG 0x003C #endif /* AVCODEC_ITUT35_H */ diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index f4cbc927b5..a1158a23c4 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -386,6 +386,80 @@ static int libdav1d_receive_frame_internal(AVCodecContext *c, Dav1dPicture *p) return res; } +static int parse_itut_t35_metadata(Libdav1dContext *dav1d, Dav1dPicture *p, + const Dav1dITUTT35 *itut_t35, AVCodecContext *c, + AVFrame *frame) { + GetByteContext gb; + int provider_code, country_code; + int res; + + 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; + + 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; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + break; + } + default: // ignore unsupported identifiers + 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); + + 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; + } 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, gb.buffer_end - gb.buffer, + 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; + } else { + // ignore unsupported provider codes + } + return 0; +} + static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) { Libdav1dContext *dav1d = c->priv_data; @@ -514,83 +588,9 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) #else const Dav1dITUTT35 *itut_t35 = p->itut_t35; #endif - GetByteContext gb; - int provider_code; - - bytestream2_init(&gb, itut_t35->payload, itut_t35->payload_size); - - provider_code = bytestream2_get_be16(&gb); - 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_parse_a53_cc(&buf, gb.buffer, bytestream2_get_bytes_left(&gb)); - if (res < 0) - goto fail; - if (!res) - break; - - res = ff_frame_new_side_data_from_buf(c, frame, AV_FRAME_DATA_A53_CC, &buf); - if (res < 0) - goto fail; - -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - c->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - break; - } - default: // ignore unsupported identifiers - break; - } - break; - } - case ITU_T_T35_PROVIDER_CODE_SMTPE: { - AVDynamicHDRPlus *hdrplus; - int provider_oriented_code = bytestream2_get_be16(&gb); - int application_identifier = bytestream2_get_byte(&gb); - - if (itut_t35->country_code != ITU_T_T35_COUNTRY_CODE_US || - provider_oriented_code != 1 || application_identifier != 4) - break; - - hdrplus = av_dynamic_hdr_plus_create_side_data(frame); - if (!hdrplus) { - res = AVERROR(ENOMEM); - goto fail; - } - - res = av_dynamic_hdr_plus_from_t35(hdrplus, gb.buffer, - bytestream2_get_bytes_left(&gb)); - if (res < 0) - goto fail; - break; - } - case ITU_T_T35_PROVIDER_CODE_DOLBY: { - int provider_oriented_code = bytestream2_get_be32(&gb); - if (itut_t35->country_code != ITU_T_T35_COUNTRY_CODE_US || - provider_oriented_code != 0x800) - break; - - res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, gb.buffer_end - gb.buffer, - c->err_recognition); - if (res < 0) { - av_log(c, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); - break; // ignore - } - - res = ff_dovi_attach_side_data(&dav1d->dovi, frame); - if (res < 0) - goto fail; - break; - } - default: // ignore unsupported provider codes - break; - } + res = parse_itut_t35_metadata(dav1d, p, itut_t35, c, frame); + if (res < 0) + goto fail; #if FF_DAV1D_VERSION_AT_LEAST(6,9) } #endif diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index da5166319e..27baf3f18e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3931,7 +3931,7 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, provider_code = bytestream2_get_be16u(&bc); if (country_code != ITU_T_T35_COUNTRY_CODE_US || - provider_code != ITU_T_T35_PROVIDER_CODE_SMTPE) + provider_code != ITU_T_T35_PROVIDER_CODE_SAMSUNG) break; // ignore provider_oriented_code = bytestream2_get_be16u(&bc); diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 408890fa89..8142d9125e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2869,7 +2869,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, size_t payload_size = sizeof(t35_buf) - 6; bytestream_put_byte(&payload, ITU_T_T35_COUNTRY_CODE_US); - bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SMTPE); + bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SAMSUNG); bytestream_put_be16(&payload, 0x01); // provider_oriented_code bytestream_put_byte(&payload, 0x04); // application_identifier -- 2.50.0.714.g196bf9f422-goog

2 1

[PATCH] avcodec/apv: align APV color format support with latest liboapv version
by Dariusz Frankiewicz 30 Jul '25

30 Jul '25

Signed-off-by: Dariusz Frankiewicz <d.frankiewic(a)samsung.com> --- configure | 2 +- libavcodec/liboapvenc.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ac143f2fea..5527c20578 100755 --- a/configure +++ b/configure @@ -6983,7 +6983,7 @@ enabled jni && { [ $target_os = "android" ] && check_headers jni.h enabled ladspa && require_headers "ladspa.h dlfcn.h" enabled lcms2 && require_pkg_config lcms2 "lcms2 >= 2.13" lcms2.h cmsCreateContext enabled libaom && require_pkg_config libaom "aom >= 2.0.0" aom/aom_codec.h aom_codec_version -enabled liboapv && require_pkg_config liboapv "oapv >= 0.1.13.1" "oapv/oapv.h" oapve_encode +enabled liboapv && require_pkg_config liboapv "oapv >= 0.2.0.0" "oapv/oapv.h" oapve_encode enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new || { enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } || die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; } diff --git a/libavcodec/liboapvenc.c b/libavcodec/liboapvenc.c index e62ef57d21..7f9fbf6929 100644 --- a/libavcodec/liboapvenc.c +++ b/libavcodec/liboapvenc.c @@ -102,9 +102,27 @@ static inline int get_color_format(enum AVPixelFormat pix_fmt) int cf = OAPV_CF_UNKNOWN; switch (pix_fmt) { + case AV_PIX_FMT_GRAY10: + cf = OAPV_CF_YCBCR400; + break; case AV_PIX_FMT_YUV422P10: cf = OAPV_CF_YCBCR422; break; + case AV_PIX_FMT_YUV422P12: + cf = OAPV_CF_YCBCR422; + break; + case AV_PIX_FMT_YUV444P10: + cf = OAPV_CF_YCBCR444; + break; + case AV_PIX_FMT_YUV444P12: + cf = OAPV_CF_YCBCR444; + break; + case AV_PIX_FMT_YUVA444P10: + cf = OAPV_CF_YCBCR4444; + break; + case AV_PIX_FMT_YUVA444P12: + cf = OAPV_CF_YCBCR4444; + break; default: av_assert0(cf != OAPV_CF_UNKNOWN); } @@ -438,7 +456,13 @@ static av_cold int liboapve_close(AVCodecContext *avctx) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const enum AVPixelFormat supported_pixel_formats[] = { + AV_PIX_FMT_GRAY10, AV_PIX_FMT_YUV422P10, + AV_PIX_FMT_YUV422P12, + AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV444P12, + AV_PIX_FMT_YUVA444P10, + AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_NONE }; -- 2.34.1

3 4

[PATCH] avformat/mov: prevent excessive allocation in mov_read_udta_string
by Sanjay Jangid 30 Jul '25

30 Jul '25

Signed-off-by: Sanjay Jangid <sanjayjangid20m(a)gmail.com> --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index c935bbf..725a9fa 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -459,6 +459,10 @@ retry: data_type = avio_rb32(pb); // type avio_rb32(pb); // unknown str_size = data_size - 16; + if (str_size >= INT_MAX / 2) { + av_log(c->fc, AV_LOG_ERROR, "str_size is too large\n"); + return AVERROR_INVALIDDATA; + } atom.size -= 16; if (!key && c->found_hdlr_mdta && c->meta_keys) { -- 2.50.1

1 0

[PATCH] avformat/mov: prevent excessive allocation in mov_read_udta_string
by Sanjay Jangid 30 Jul '25

30 Jul '25

Signed-off-by: Sanjay Jangid <sanjayjangid20m(a)gmail.com> --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index c935bbf..725a9fa 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -459,6 +459,10 @@ retry: data_type = avio_rb32(pb); // type avio_rb32(pb); // unknown str_size = data_size - 16; + if (str_size >= INT_MAX / 2) { + av_log(c->fc, AV_LOG_ERROR, "str_size is too large\n"); + return AVERROR_INVALIDDATA; + } atom.size -= 16; if (!key && c->found_hdlr_mdta && c->meta_keys) { -- 2.50.1

1 0