January 2022 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 1/2] avcodec/{ass, webvttdec}: fix handling of backslashes
by Oneric 06 Feb '22

06 Feb '22

Backslashes cannot be escaped by backslashes in any ASS renderer, but unless followed by a few specific characters it is just printed as a regular character. Insert a word-joiner character after a backslash to break up the active sequences without changing the visual output. Also the existing \{ and \} escapes are specific to libass only. --- The patch assumes UTF-8 encoding in ff_ass_bprint_text_event (WebVTT requires UTF-8 per sepc). If we cannot assume a particular encoding, please advise how to best insert a word-joiner character in the correct encoding. --- libavcodec/ass.c | 5 ++++- libavcodec/webvttdec.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 725e4d42ba..461e110ca4 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -157,8 +157,11 @@ void ff_ass_bprint_text_event(AVBPrint *buf, const char *p, int size, /* standard ASS escaping so random characters don't get mis-interpreted * as ASS */ - } else if (!keep_ass_markup && strchr("{}\\", *p)) { + } else if (!keep_ass_markup && strchr("{}", *p)) { av_bprintf(buf, "\\%c", *p); + } else if (!keep_ass_markup && *p == '\\') { + // append word-joiner U+2060 as UTF-8 to break up sequences like \N + av_bprintf(buf, "\\\xe2\x81\xa0"); /* some packets might end abruptly (no \0 at the end, like for example * in some cases of demuxing from a classic video container), some diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c index 0093f328fa..8cb739697a 100644 --- a/libavcodec/webvttdec.c +++ b/libavcodec/webvttdec.c @@ -37,7 +37,7 @@ static const struct { {"", "{\\i1}"}, {"", "{\\i0}"}, {"", "{\\b1}"}, {"", "{\\b0}"}, {"", "{\\u1}"}, {"", "{\\u0}"}, - {"{", "\\{"}, {"}", "\\}"}, // escape to avoid ASS markup conflicts + {"{", "\\{"}, {"}", "\\}"}, {"\\", "\\\xe2\x81\xa0"}, // escape to avoid ASS markup conflicts {">", ">"}, {"<", "<"}, {"&lrm;", ""}, {"&rlm;", ""}, // FIXME: properly honor bidi marks {"&", "&"}, {" ", "\\h"}, -- 2.30.2

3 27

[PATCH v2 00/31] New FIFO API
by Andreas Rheinhardt 05 Feb '22

05 Feb '22

This is a modified version of Anton's earlier patchset [1]. The main changes are that the new FIFO API is a clean break with the old API (the new API uses a new structure (called AVFifo) instead of sharing AVFifoBuffer with the old API) and that it is now documented that one may attempt to read/write more from/to the FIFO than is currently possible and that such an attempt leads to an error being returned. This allows to replace loops of the form while (av_fifo_size(fifo)) { TYPE element; av_fifo_generic_read(fifo, &element, sizeof(element), NULL); // do something with element, typically: free it } by TYPE element; while (av_fifo_read(fifo, &element, 1) >= 0) // do something with element - Andreas [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2022-January/291156.html Andreas Rheinhardt (2): avutil/fifo: Use av_fifo_generic_peek_at() for av_fifo_generic_peek() avcodec/qsvenc: Reindent after the previous commit Anton Khirnov (29): lavu/fifo: disallow overly large fifo sizes lavu/fifo: Add new AVFifo API based upon the notion of element size lavu/fifo: add a flag for automatically growing the FIFO as needed lavu/tests/fifo: switch to the new API lavc/avcodec: switch to new FIFO API lavc/amfenc: switch to new FIFO API lavc/cuviddec: do not reallocate the fifo unnecessarily lavc/cuviddec: convert to the new FIFO API lavc/libvorbisenc: switch to new FIFO API lavc/libvpxenc: switch to the new FIFO API lavc/libvpxenc: remove unneeded context variable lavc/nvenc: switch to the new FIFO API lavc/qsvdec: switch to the new FIFO API lavc/qsvenc: switch to new FIFO API lavf/dvenc: return an error on audio/video desync lavf/dvenc: switch to new FIFO API lavf/mpegenc: switch to new FIFO API lavf/swfenc: switch to new FIFO API lavf/udp: switch to new FIFO API lavf/async: switch to new FIFO API lavd/jack: switch to the new FIFO API lavu/audio_fifo: drop an unnecessary include lavu/audio_fifo: switch to new FIFO API lavu/threadmessage: switch to new FIFO API lavfi/qsvvpp: switch to new FIFO API lavfi/vf_deshake_opencl: switch to new FIFO API ffplay: switch to new FIFO API ffmpeg: switch to new FIFO API avutil/fifo: Deprecate old FIFO API doc/APIchanges | 17 ++ fftools/ffmpeg.c | 69 +++----- fftools/ffmpeg.h | 6 +- fftools/ffmpeg_filter.c | 14 +- fftools/ffmpeg_opt.c | 4 +- fftools/ffplay.c | 22 +-- libavcodec/amfenc.c | 43 ++--- libavcodec/amfenc.h | 2 +- libavcodec/avcodec.c | 17 +- libavcodec/cuviddec.c | 28 ++- libavcodec/decode.c | 24 +-- libavcodec/internal.h | 2 +- libavcodec/libvorbisenc.c | 20 +-- libavcodec/libvpxenc.c | 42 ++--- libavcodec/nvenc.c | 49 +++--- libavcodec/nvenc.h | 8 +- libavcodec/qsvdec.c | 88 ++++------ libavcodec/qsvenc.c | 134 +++++++------- libavcodec/qsvenc.h | 2 +- libavdevice/jack.c | 30 ++-- libavfilter/qsvvpp.c | 46 ++--- libavfilter/qsvvpp.h | 2 +- libavfilter/vf_deshake_opencl.c | 92 ++++------ libavformat/async.c | 68 ++++---- libavformat/dvenc.c | 28 +-- libavformat/mpegenc.c | 40 +++-- libavformat/swfenc.c | 22 ++- libavformat/udp.c | 34 ++-- libavutil/audio_fifo.c | 44 ++--- libavutil/audio_fifo.h | 1 - libavutil/fifo.c | 298 +++++++++++++++++++++++++++++--- libavutil/fifo.h | 237 ++++++++++++++++++++++++- libavutil/tests/fifo.c | 47 +++-- libavutil/threadmessage.c | 38 ++-- libavutil/version.h | 3 +- 35 files changed, 986 insertions(+), 635 deletions(-) -- 2.32.0

2 33

Refactoring UUID functionality
by Pierre-Anthony Lemieux 05 Feb '22

05 Feb '22

Hi all, It was recently suggested that UUID functionality in the codebase could be refactored into a single library. Below is short explainer. I would appreciate your review/feedback before I/we start writing code. Best, -- Pierre # Common UUID library ## Why In the course of the IMF demuxer code review [^1], it was suggested that UUID handling should be delegated to `libuuid` [^2]. It was further pointed out that: * `libuuid`, as-is, is not a great fit for the IMF demuxer [^3] * other parts of FFmpeg use UUIDs, e.g. `libavformat/mov.c` and `libavcodec/cbs_sei.h` * `libuuid` does not build on Windows [^1] https://patchwork.ffmpeg.org/project/ffmpeg/patch/20211206031853.21739-1-pa… [^2] https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/libuuid [^3] https://ffmpeg.org/pipermail/ffmpeg-devel/2021-December/290365.html ## Proposal The proposal is to develop a single UUID library for use across FFmpeg. The library would reuse (by copying) existing code whenever possible, e.g. from libuuid. It would be implemented as `libavutil/uuid.h` and `libavutil/uuid.c` and expose a public API, e.g. `int av_uuid_parse(...)`. ## Goals The library would refactor into a single library the UUID functionality currently in use by FFmpeg. ## Non-goals The library is not intended to be a generic UUID library. ## Affected files Below is an initial list of files that will probably require modifications: * `libavcodec/cbs_sei.h` * `libavcodec/cbs_sei_syntax_template.c` * `libavcodec/h264_metadata_bsf.c` * `libavcodec/vaapi_encode_h264.c` * `libavfilter/vf_showinfo.c` * `libavformat/imf_cpl.c` * `libavformat/imf.h` * `libavformat/imfdec.c` * `libavformat/tests/imf.c` * `libavformat/mov.c` * `libavformat/movenc.c` * `libavformat/smoothstreamingenc.c` * `libavutil/hwcontext_cuda.c` * `libavutil/hwcontext_vulkan.c` `libavforamt/mxfenc.c` defines `mxf_write_uuid()` but it looks like this is used to write hardcoded instance UIDs, and thus is not really about generic UUIDs. Perhaps that function should be renamed `mxf_write_uid()`. ## Pluses * reduces code duplication ## Minuses * requires touching stable FFmpeg code

2 1

[PATCH] Add libavformat/tests/imf to .gitignore
by pal＠sandflow.com 05 Feb '22

05 Feb '22

From: Pierre-Anthony Lemieux <pal(a)palemieux.com> Signed-off-by: Pierre-Anthony Lemieux <pal(a)palemieux.com> --- libavformat/tests/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/tests/.gitignore b/libavformat/tests/.gitignore index 7ceb7a356b..aabf76345e 100644 --- a/libavformat/tests/.gitignore +++ b/libavformat/tests/.gitignore @@ -1,4 +1,5 @@ /fifo_muxer +/imf /movenc /noproxy /rtmpdh -- 2.17.1

3 2

[PATCH] avformat/imf: s/++i/i++/g
by Zane van Iperen 05 Feb '22

05 Feb '22

--- libavformat/imfdec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 023f3556f6..3925462a26 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -263,7 +263,7 @@ static void imf_asset_locator_map_init(IMFAssetLocatorMap *asset_map) */ static void imf_asset_locator_map_deinit(IMFAssetLocatorMap *asset_map) { - for (uint32_t i = 0; i < asset_map->asset_count; ++i) + for (uint32_t i = 0; i < asset_map->asset_count; i++) av_freep(&asset_map->assets[i].absolute_uri); av_freep(&asset_map->assets); @@ -334,7 +334,7 @@ clean_up: static IMFAssetLocator *find_asset_map_locator(IMFAssetLocatorMap *asset_map, FFIMFUUID uuid) { - for (uint32_t i = 0; i < asset_map->asset_count; ++i) { + for (uint32_t i = 0; i < asset_map->asset_count; i++) { if (memcmp(asset_map->assets[i].uuid, uuid, 16) == 0) return &(asset_map->assets[i]); } @@ -471,7 +471,7 @@ static int open_track_file_resource(AVFormatContext *s, return AVERROR(ENOMEM); track->resources = tmp; - for (uint32_t i = 0; i < track_file_resource->base.repeat_count; ++i) { + for (uint32_t i = 0; i < track_file_resource->base.repeat_count; i++) { IMFVirtualTrackResourcePlaybackCtx vt_ctx; vt_ctx.locator = asset_locator; @@ -491,7 +491,7 @@ static int open_track_file_resource(AVFormatContext *s, static void imf_virtual_track_playback_context_deinit(IMFVirtualTrackPlaybackCtx *track) { - for (uint32_t i = 0; i < track->resource_count; ++i) + for (uint32_t i = 0; i < track->resource_count; i++) avformat_close_input(&track->resources[i].ctx); av_freep(&track->resources); @@ -553,7 +553,7 @@ static int set_context_streams_from_tracks(AVFormatContext *s) IMFContext *c = s->priv_data; int ret = 0; - for (uint32_t i = 0; i < c->track_count; ++i) { + for (uint32_t i = 0; i < c->track_count; i++) { AVStream *asset_stream; AVStream *first_resource_stream; @@ -600,7 +600,7 @@ static int open_cpl_tracks(AVFormatContext *s) } } - for (uint32_t i = 0; i < c->cpl->main_audio_track_count; ++i) { + for (uint32_t i = 0; i < c->cpl->main_audio_track_count; i++) { if ((ret = open_virtual_track(s, &c->cpl->main_audio_tracks[i], track_index++)) != 0) { av_log(s, AV_LOG_ERROR, @@ -718,7 +718,7 @@ static IMFVirtualTrackResourcePlaybackCtx *get_resource_context_for_timestamp(AV track->index, av_q2d(track->current_timestamp), av_q2d(track->duration)); - for (uint32_t i = 0; i < track->resource_count; ++i) { + for (uint32_t i = 0; i < track->resource_count; i++) { cumulated_duration = av_add_q(cumulated_duration, av_make_q((int)track->resources[i].resource->base.duration * edit_unit_duration.num, @@ -843,7 +843,7 @@ static int imf_close(AVFormatContext *s) imf_asset_locator_map_deinit(&c->asset_locator_map); ff_imf_cpl_free(c->cpl); - for (uint32_t i = 0; i < c->track_count; ++i) { + for (uint32_t i = 0; i < c->track_count; i++) { imf_virtual_track_playback_context_deinit(c->tracks[i]); av_freep(&c->tracks[i]); } -- Just for you Paul...

3 3

[PATCH 0/5] Add IPFS and IPNS protocol support
by Mark Gaiser 04 Feb '22

04 Feb '22

Hi, This patch series adds support for IPFS. I've been adviced to keep the patches as they are (split). If needed, I can squash them to a single patch. The following is a short summary. In the IPFS ecosystem you access it's content by a "Content IDentifier" (CID). This CID is, in simplified terms, a hash of the content. IPFS itself is a distributed network where any user can run a node to be part of the network and access files by their CID. If any reachable node within that network has the CID, you can get it. IPFS (as a technology) has two protocols, ipfs and ipns. The ipfs protocol is the immutable way to access content. The ipns protocol is a mutable layer on top of it. It's essentially a new CID that points to a ipfs CID. This "pointer" if you will can be changed to point to something else. Much more information on how this technology works can be found here [1]. This patch series allows to interact natively with IPFS. That means being able to access files like: - ffplay ipfs://<cid> - ffplay ipns://<cid> There are multiple ways to access files on the IPFS network. This patch series uses the gateway driven way. An IPFS node - by default - exposes a local gateway (say http://localhost:8080) which is then used to get content from IPFS. Much of the logic in this patch series is to find that gateway and essentially rewrite: "ipfs://<cid>" to: "http://localhost:8080/ipfs/<cid>" Once that's found it's forwared to the protocol handler where eventually the http protocol is going to handle it. Note that it could also be https. There's enough flexibility in the implementation to allow the user to provide a gateway. There are also public https gateways which can be used just as well. After this patch is accepted, I'll work on getting IPFS supported in: - mpv (requires this ffmpeg patch) - vlc (prefers this patch but can be made to work without this patch) - kodi (requires this ffmpeg patch) Best regards, Mark Gaiser [1] https://docs.ipfs.io/concepts/ Mark Gaiser (5): Early version of IPFS protocol support. Fix up IPNS support. Merge IPNS and IPFS handling. Implement logic to determine the IPFS gateway. Fix review feedback configure | 2 + doc/protocols.texi | 30 +++++ libavformat/Makefile | 2 + libavformat/ipfs.c | 283 ++++++++++++++++++++++++++++++++++++++++ libavformat/protocols.c | 2 + 5 files changed, 319 insertions(+) create mode 100644 libavformat/ipfs.c -- 2.35.1

5 25

[PATCH] avcodec/dvdsubdec: fix incorrect yellow appearance of dvd subtitles
by ffmpegagent 04 Feb '22

04 Feb '22

From: softworkz <softworkz(a)hotmail.com> The guess_palette() implementation is questionable in itself as its results don't match those from other DVD subtitle decoders. This commit starts cleanup by fixing an obvious bug which has made certain DVD subs appear yellow instead of white or grey for more than 10 years.. Signed-off-by: softworkz <softworkz(a)hotmail.com> --- avcodec/dvdsubdec: fix incorrect yellow appearance of dvd subtitles Fixes an age-old bug in decoding DVD subtitles. Ever wondered why certain DVD subtitles are shown in yellow color when ffmpeg is involved... Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-16%2Fsoftwork… Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-16/softworkz/patch_dvdsubdec_fix-v1 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/16 libavcodec/dvdsubdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 52259f0730..a3fdb535a5 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -400,7 +400,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, } else { sub_header->rects[0]->nb_colors = 4; guess_palette(ctx, (uint32_t*)sub_header->rects[0]->data[1], - 0xffff00); + 0xffffff); } sub_header->rects[0]->x = x1; sub_header->rects[0]->y = y1; base-commit: 573b6b8a607398c5f34108efda9c29d41c5727ff -- ffmpeg-codebot

3 5

[PATCH 1/2] libfdk-aacdec: Add an option for setting the decoder's DRC album mode
by Martin Storsjö 03 Feb '22

03 Feb '22

--- libavcodec/libfdk-aacdec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index ffa1fdcce3..93b52023b0 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -56,6 +56,7 @@ typedef struct FDKAACDecContext { int drc_heavy; int drc_effect; int drc_cut; + int album_mode; int level_limit; int output_delay; } FDKAACDecContext; @@ -87,6 +88,10 @@ static const AVOption fdk_aac_dec_options[] = { #if FDKDEC_VER_AT_LEAST(3, 0) // 3.0.0 { "drc_effect","Dynamic Range Control: effect type, where e.g. [0] is none and [6] is general", OFFSET(drc_effect), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 8, AD, NULL }, +#endif +#if FDKDEC_VER_AT_LEAST(3, 1) // 3.1.0 + { "album_mode","Dynamic Range Control: album mode, where [0] is off and [1] is on", + OFFSET(album_mode), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, AD, NULL }, #endif { NULL } }; @@ -335,6 +340,15 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx) } #endif +#if FDKDEC_VER_AT_LEAST(3, 1) // 3.1.0 + if (s->album_mode != -1) { + if (aacDecoder_SetParam(s->handle, AAC_UNIDRC_ALBUM_MODE, s->album_mode) != AAC_DEC_OK) { + av_log(avctx, AV_LOG_ERROR, "Unable to set album mode in the decoder\n"); + return AVERROR_UNKNOWN; + } + } +#endif + avctx->sample_fmt = AV_SAMPLE_FMT_S16; s->decoder_buffer_size = DECODER_BUFFSIZE * DECODER_MAX_CHANNELS; -- 2.32.0 (Apple Git-132)

2 5

[PATCH] ffprobe: allow side-data selection by element
by Gyan Doshi 03 Feb '22

03 Feb '22

At present, side data printing forces display for all levels i.e. stream, packets and frames. This can bloat output and also force decode of all frames in selected streams. Now, stream_side_data[=type], packet_side_data[=type] & frame_side_data[=type] can be used with -show_entries to specify carrier element. --- fftools/ffprobe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 20582ca7ac..8a8e3de540 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -223,7 +223,7 @@ static struct section sections[] = { [SECTION_ID_FRAME] = { SECTION_ID_FRAME, "frame", 0, { SECTION_ID_FRAME_TAGS, SECTION_ID_FRAME_SIDE_DATA_LIST, SECTION_ID_FRAME_LOGS, -1 } }, [SECTION_ID_FRAME_TAGS] = { SECTION_ID_FRAME_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "frame_tags" }, [SECTION_ID_FRAME_SIDE_DATA_LIST] ={ SECTION_ID_FRAME_SIDE_DATA_LIST, "side_data_list", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA, -1 }, .element_name = "side_data", .unique_name = "frame_side_data_list" }, - [SECTION_ID_FRAME_SIDE_DATA] = { SECTION_ID_FRAME_SIDE_DATA, "side_data", 0, { SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST, SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST, -1 } }, + [SECTION_ID_FRAME_SIDE_DATA] = { SECTION_ID_FRAME_SIDE_DATA, "side_data", 0, { SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST, SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST, -1 }, .unique_name = "frame_side_data" }, [SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST] = { SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST, "timecodes", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, -1 } }, [SECTION_ID_FRAME_SIDE_DATA_TIMECODE] = { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, "timecode", 0, { -1 } }, [SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST] = { SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST, "components", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_COMPONENT, -1 } }, @@ -239,7 +239,7 @@ static struct section sections[] = { [SECTION_ID_PACKET] = { SECTION_ID_PACKET, "packet", 0, { SECTION_ID_PACKET_TAGS, SECTION_ID_PACKET_SIDE_DATA_LIST, -1 } }, [SECTION_ID_PACKET_TAGS] = { SECTION_ID_PACKET_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "packet_tags" }, [SECTION_ID_PACKET_SIDE_DATA_LIST] ={ SECTION_ID_PACKET_SIDE_DATA_LIST, "side_data_list", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PACKET_SIDE_DATA, -1 }, .element_name = "side_data", .unique_name = "packet_side_data_list" }, - [SECTION_ID_PACKET_SIDE_DATA] = { SECTION_ID_PACKET_SIDE_DATA, "side_data", 0, { -1 } }, + [SECTION_ID_PACKET_SIDE_DATA] = { SECTION_ID_PACKET_SIDE_DATA, "side_data", 0, { -1 }, .unique_name = "packet_side_data" }, [SECTION_ID_PIXEL_FORMATS] = { SECTION_ID_PIXEL_FORMATS, "pixel_formats", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PIXEL_FORMAT, -1 } }, [SECTION_ID_PIXEL_FORMAT] = { SECTION_ID_PIXEL_FORMAT, "pixel_format", 0, { SECTION_ID_PIXEL_FORMAT_FLAGS, SECTION_ID_PIXEL_FORMAT_COMPONENTS, -1 } }, [SECTION_ID_PIXEL_FORMAT_FLAGS] = { SECTION_ID_PIXEL_FORMAT_FLAGS, "flags", 0, { -1 }, .unique_name = "pixel_format_flags" }, @@ -262,7 +262,7 @@ static struct section sections[] = { [SECTION_ID_STREAM_DISPOSITION] = { SECTION_ID_STREAM_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_disposition" }, [SECTION_ID_STREAM_TAGS] = { SECTION_ID_STREAM_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "stream_tags" }, [SECTION_ID_STREAM_SIDE_DATA_LIST] ={ SECTION_ID_STREAM_SIDE_DATA_LIST, "side_data_list", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_SIDE_DATA, -1 }, .element_name = "side_data", .unique_name = "stream_side_data_list" }, - [SECTION_ID_STREAM_SIDE_DATA] = { SECTION_ID_STREAM_SIDE_DATA, "side_data", 0, { -1 } }, + [SECTION_ID_STREAM_SIDE_DATA] = { SECTION_ID_STREAM_SIDE_DATA, "side_data", 0, { -1 }, .unique_name = "stream_side_data" }, [SECTION_ID_SUBTITLE] = { SECTION_ID_SUBTITLE, "subtitle", 0, { -1 } }, }; -- 2.34.1

1 2

[PATCH] avformat/imf_cpl: do not use filesize when reading XML file
by Marton Balint 03 Feb '22

03 Feb '22

Similar to the earlier patch applied to imfdec. Signed-off-by: Marton Balint <cus(a)passwd.hu> --- libavformat/imf_cpl.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c index f2ad9c05d6..102a6b4549 100644 --- a/libavformat/imf_cpl.c +++ b/libavformat/imf_cpl.c @@ -797,13 +797,11 @@ int ff_imf_parse_cpl(AVIOContext *in, FFIMFCPL **cpl) AVBPrint buf; xmlDoc *doc = NULL; int ret = 0; - int64_t filesize = 0; - filesize = avio_size(in); - filesize = filesize > 0 ? filesize : 8192; - av_bprint_init(&buf, filesize + 1, AV_BPRINT_SIZE_UNLIMITED); - ret = avio_read_to_bprint(in, &buf, UINT_MAX - 1); - if (ret < 0 || !avio_feof(in) || buf.len == 0) { + av_bprint_init(&buf, 0, INT_MAX); // xmlReadMemory uses integer length + + ret = avio_read_to_bprint(in, &buf, SIZE_MAX); + if (ret < 0 || !avio_feof(in)) { av_log(NULL, AV_LOG_ERROR, "Cannot read IMF CPL\n"); if (ret == 0) ret = AVERROR_INVALIDDATA; @@ -812,8 +810,7 @@ int ff_imf_parse_cpl(AVIOContext *in, FFIMFCPL **cpl) LIBXML_TEST_VERSION - filesize = buf.len; - doc = xmlReadMemory(buf.str, filesize, NULL, NULL, 0); + doc = xmlReadMemory(buf.str, buf.len, NULL, NULL, 0); if (!doc) { av_log(NULL, AV_LOG_ERROR, -- 2.31.1

2 1