[PATCH v12 0/8] Properly decode ogg metadata in ogg/{vorbis, flac, opus} chained bitstreams.
This is a series of patches to allow proper decoding of ogg metadata in chained `ogg/vorbis, `ogg/flac` and `ogg/opus` streams. Samples are available at: https://www.dropbox.com/scl/fo/xrtrna2rxr1j354hrtymq/AGwemlxHYecBLNmQ8Fsy--4?rlkey=lzilr4m9w4gfdqygoe172vvy8&dl=0 ## Changes since last version: * Reverted metadata decoding logic to the previous, simpler implementation. Romain Beauxis (8): libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` packet extra data, attach them to the next decoded frame. tests: Add stream dump test API util. tests: Add chained ogg/vorbis stream dump test. libavformat/oggdec.h, libavformat/oggparsevorbis.c: Factor out vorbis metadata update mechanism. libavformat/oggparseflac.c: Parse ogg/flac comments in new ogg packets, add them to ogg stream new_metadata. tests: Add chained ogg/flac stream dump test. libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet. tests: Add chained ogg/opus stream dump test. libavcodec/decode.c | 19 +++ libavformat/oggdec.h | 14 ++ libavformat/oggparseflac.c | 21 +++ libavformat/oggparseopus.c | 13 +- libavformat/oggparsevorbis.c | 25 ++- tests/Makefile | 4 + tests/api/Makefile | 2 +- tests/api/api-dump-stream-meta-test.c | 177 +++++++++++++++++++++ tests/fate/ogg-flac.mak | 11 ++ tests/fate/ogg-opus.mak | 11 ++ tests/fate/ogg-vorbis.mak | 11 ++ tests/ref/fate/ogg-flac-chained-meta.txt | 13 ++ tests/ref/fate/ogg-opus-chained-meta.txt | 27 ++++ tests/ref/fate/ogg-vorbis-chained-meta.txt | 17 ++ 14 files changed, 355 insertions(+), 10 deletions(-) create mode 100644 tests/api/api-dump-stream-meta-test.c create mode 100644 tests/fate/ogg-flac.mak create mode 100644 tests/fate/ogg-opus.mak create mode 100644 tests/fate/ogg-vorbis.mak create mode 100644 tests/ref/fate/ogg-flac-chained-meta.txt create mode 100644 tests/ref/fate/ogg-opus-chained-meta.txt create mode 100644 tests/ref/fate/ogg-vorbis-chained-meta.txt -- 2.39.5 (Apple Git-154)
--- libavcodec/decode.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index fca0c7ff58..06d899a9dd 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -97,6 +97,8 @@ typedef struct DecodeContext { int lcevc_frame; int width; int height; + + AVDictionary *pending_metadata; } DecodeContext; static DecodeContext *decode_ctx(AVCodecInternal *avci) @@ -702,6 +704,8 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke { AVCodecInternal *avci = avctx->internal; DecodeContext *dc = decode_ctx(avci); + const uint8_t *side_metadata; + size_t size; int ret; if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec)) @@ -719,6 +723,14 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke ret = av_packet_ref(avci->buffer_pkt, avpkt); if (ret < 0) return ret; + + side_metadata = av_packet_get_side_data(avpkt, AV_PKT_DATA_METADATA_UPDATE, &size); + if (side_metadata) { + av_dict_free(&dc->pending_metadata); + ret = av_packet_unpack_dictionary(side_metadata, size, &dc->pending_metadata); + if (ret < 0) + return ret; + } } else dc->draining_started = 1; @@ -788,6 +800,7 @@ fail: int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) { AVCodecInternal *avci = avctx->internal; + DecodeContext *dc = decode_ctx(avci); int ret; if (avci->buffer_frame->buf[0]) { @@ -810,6 +823,11 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) avctx->frame_num++; + if (dc->pending_metadata) { + av_dict_copy(&frame->metadata, dc->pending_metadata, AV_DICT_APPEND); + av_dict_free(&dc->pending_metadata); + } + return 0; fail: av_frame_unref(frame); @@ -2220,4 +2238,5 @@ void ff_decode_internal_uninit(AVCodecContext *avctx) DecodeContext *dc = decode_ctx(avci); av_refstruct_unref(&dc->lcevc); + av_dict_free(&dc->pending_metadata); } -- 2.39.5 (Apple Git-154)
On Tue, Apr 15, 2025 at 05:22:29PM -0500, Romain Beauxis wrote:
--- libavcodec/decode.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index fca0c7ff58..06d899a9dd 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -97,6 +97,8 @@ typedef struct DecodeContext { int lcevc_frame; int width; int height; + + AVDictionary *pending_metadata; } DecodeContext;
static DecodeContext *decode_ctx(AVCodecInternal *avci) @@ -702,6 +704,8 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke { AVCodecInternal *avci = avctx->internal; DecodeContext *dc = decode_ctx(avci); + const uint8_t *side_metadata; + size_t size; int ret;
if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec)) @@ -719,6 +723,14 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke ret = av_packet_ref(avci->buffer_pkt, avpkt); if (ret < 0) return ret; + + side_metadata = av_packet_get_side_data(avpkt, AV_PKT_DATA_METADATA_UPDATE, &size); + if (side_metadata) { + av_dict_free(&dc->pending_metadata); + ret = av_packet_unpack_dictionary(side_metadata, size, &dc->pending_metadata); + if (ret < 0) + return ret; + } } else dc->draining_started = 1;
@@ -788,6 +800,7 @@ fail: int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) { AVCodecInternal *avci = avctx->internal; + DecodeContext *dc = decode_ctx(avci); int ret;
if (avci->buffer_frame->buf[0]) { @@ -810,6 +823,11 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
avctx->frame_num++;
+ if (dc->pending_metadata) { + av_dict_copy(&frame->metadata, dc->pending_metadata, AV_DICT_APPEND); + av_dict_free(&dc->pending_metadata); + } + return 0; fail: av_frame_unref(frame); @@ -2220,4 +2238,5 @@ void ff_decode_internal_uninit(AVCodecContext *avctx) DecodeContext *dc = decode_ctx(avci);
av_refstruct_unref(&dc->lcevc); + av_dict_free(&dc->pending_metadata); } -- 2.39.5 (Apple Git-154)
My issue with this is the same as it was previously Please correct me if iam wrong (it is very possible that iam wrong on some assumtations here) the decoder is variable delay (exact delay depends on cpu cores and luck) on the input we have some side data from an AVPacket then some packets will result in nothing to come out (because maybe they are damaged or the users asked non key frames to be skiped or whatever) some packets will decode into AVFrames in one of several threads and these AVFrames then come back out how can code that seems to ignore this be correct ? Shouldnt the data be associated with the packet go through the decoder with it ? Or is this data not associated with the packet in that sense ? thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The educated differ from the uneducated as much as the living from the dead. -- Aristotle
Le dim. 20 avr. 2025 à 15:08, Michael Niedermayer <michael@niedermayer.cc> a écrit :
On Tue, Apr 15, 2025 at 05:22:29PM -0500, Romain Beauxis wrote:
--- libavcodec/decode.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index fca0c7ff58..06d899a9dd 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -97,6 +97,8 @@ typedef struct DecodeContext { int lcevc_frame; int width; int height; + + AVDictionary *pending_metadata; } DecodeContext;
static DecodeContext *decode_ctx(AVCodecInternal *avci) @@ -702,6 +704,8 @@ int attribute_align_arg
avcodec_send_packet(AVCodecContext *avctx, const AVPacke
{ AVCodecInternal *avci = avctx->internal; DecodeContext *dc = decode_ctx(avci); + const uint8_t *side_metadata; + size_t size; int ret;
if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec)) @@ -719,6 +723,14 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke ret = av_packet_ref(avci->buffer_pkt, avpkt); if (ret < 0) return ret; + + side_metadata = av_packet_get_side_data(avpkt, AV_PKT_DATA_METADATA_UPDATE, &size); + if (side_metadata) { + av_dict_free(&dc->pending_metadata); + ret = av_packet_unpack_dictionary(side_metadata, size, &dc->pending_metadata); + if (ret < 0) + return ret; + } } else dc->draining_started = 1;
@@ -788,6 +800,7 @@ fail: int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) { AVCodecInternal *avci = avctx->internal; + DecodeContext *dc = decode_ctx(avci); int ret;
if (avci->buffer_frame->buf[0]) { @@ -810,6 +823,11 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
avctx->frame_num++;
+ if (dc->pending_metadata) { + av_dict_copy(&frame->metadata, dc->pending_metadata, AV_DICT_APPEND); + av_dict_free(&dc->pending_metadata); + } + return 0; fail: av_frame_unref(frame); @@ -2220,4 +2238,5 @@ void ff_decode_internal_uninit(AVCodecContext *avctx) DecodeContext *dc = decode_ctx(avci);
av_refstruct_unref(&dc->lcevc); + av_dict_free(&dc->pending_metadata); } -- 2.39.5 (Apple Git-154)
My issue with this is the same as it was previously Please correct me if iam wrong (it is very possible that iam wrong on some assumtations here)
the decoder is variable delay (exact delay depends on cpu cores and luck) on the input we have some side data from an AVPacket then some packets will result in nothing to come out (because maybe they are damaged or the users asked non key frames to be skiped or whatever) some packets will decode into AVFrames in one of several threads and these AVFrames then come back out
how can code that seems to ignore this be correct ?
Shouldnt the data be associated with the packet go through the decoder with it ? Or is this data not associated with the packet in that sense ?
Yeah that makes sense. How about the following: * Keep metadata's associated PTS * Only attach a metadata to an outgoing frame with the same PTS * Keep the latest pair of PTS/metadata in the decoder, erasing existing one when a new one comes through. This is a step closer to the previous tree implementation but prevents issues with accumulating metadata.
thx
[...]
-- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The educated differ from the uneducated as much as the living from the dead. -- Aristotle _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
--- tests/Makefile | 1 + tests/api/Makefile | 2 +- tests/api/api-dump-stream-meta-test.c | 177 ++++++++++++++++++++++++++ 3 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 tests/api/api-dump-stream-meta-test.c diff --git a/tests/Makefile b/tests/Makefile index f9f5fc07f3..1f7e5003c2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -277,6 +277,7 @@ $(FATE_FFPROBE) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_FFPROBE) $(FATE_SAMPLES_FF $(FATE_SAMPLES_FASTSTART): tools/qt-faststart$(EXESUF) $(FATE_SAMPLES_DUMP_DATA) $(FATE_SAMPLES_DUMP_DATA-yes): tools/venc_data_dump$(EXESUF) $(FATE_SAMPLES_SCALE_SLICE): tools/scale_slice_test$(EXESUF) +$(FATE_SAMPLES_DUMP_STREAM_META): tests/api/api-dump-stream-meta-test$(EXESUF) ifdef SAMPLES FATE += $(FATE_EXTERN) diff --git a/tests/api/Makefile b/tests/api/Makefile index c96e636756..a2cb06a729 100644 --- a/tests/api/Makefile +++ b/tests/api/Makefile @@ -1,7 +1,7 @@ APITESTPROGS-$(call ENCDEC, FLAC, FLAC) += api-flac APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264 APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264-slice -APITESTPROGS-yes += api-seek +APITESTPROGS-yes += api-seek api-dump-stream-meta APITESTPROGS-$(call DEMDEC, H263, H263) += api-band APITESTPROGS-$(HAVE_THREADS) += api-threadmessage APITESTPROGS += $(APITESTPROGS-yes) diff --git a/tests/api/api-dump-stream-meta-test.c b/tests/api/api-dump-stream-meta-test.c new file mode 100644 index 0000000000..bbfbd1f30b --- /dev/null +++ b/tests/api/api-dump-stream-meta-test.c @@ -0,0 +1,177 @@ +/* + * Copyright (c) 2025 Romain Beauxis + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * Dump stream metadata + */ + +#include "libavcodec/avcodec.h" +#include "libavformat/avformat.h" +#include "libavutil/timestamp.h" + +static int dump_stream_meta(const char *input_filename) { + const AVCodec *codec = NULL; + AVPacket *pkt = NULL; + AVFrame *fr = NULL; + AVFormatContext *fmt_ctx = NULL; + AVCodecContext *ctx = NULL; + AVCodecParameters *origin_par = NULL; + AVStream *st; + int stream_idx = 0; + int result; + char *metadata; + + result = avformat_open_input(&fmt_ctx, input_filename, NULL, NULL); + if (result < 0) { + av_log(NULL, AV_LOG_ERROR, "Can't open file\n"); + return result; + } + + result = avformat_find_stream_info(fmt_ctx, NULL); + if (result < 0) { + av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n"); + goto end; + } + + if (fmt_ctx->nb_streams > 1) { + av_log(NULL, AV_LOG_ERROR, "More than one stream found in input!\n"); + goto end; + } + + origin_par = fmt_ctx->streams[stream_idx]->codecpar; + st = fmt_ctx->streams[stream_idx]; + + result = av_dict_get_string(st->metadata, &metadata, '=', ':'); + if (result < 0) + goto end; + + printf("Stream ID: %d, codec name: %s, metadata: %s\n", stream_idx, + avcodec_get_name(origin_par->codec_id), + strlen(metadata) ? metadata : "N/A"); + + codec = avcodec_find_decoder(origin_par->codec_id); + if (!codec) { + av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n"); + result = AVERROR_DECODER_NOT_FOUND; + goto end; + } + + ctx = avcodec_alloc_context3(codec); + if (!ctx) { + av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n"); + result = AVERROR(ENOMEM); + goto end; + } + + result = avcodec_parameters_to_context(ctx, origin_par); + if (result) { + av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n"); + goto end; + } + + result = avcodec_open2(ctx, codec, NULL); + if (result < 0) { + av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n"); + goto end; + } + + pkt = av_packet_alloc(); + if (!pkt) { + av_log(NULL, AV_LOG_ERROR, "Cannot allocate packet\n"); + result = AVERROR(ENOMEM); + goto end; + } + + fr = av_frame_alloc(); + if (!fr) { + av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n"); + result = AVERROR(ENOMEM); + goto end; + } + + for (;;) { + result = av_read_frame(fmt_ctx, pkt); + if (result) + goto end; + + if (pkt->stream_index != stream_idx) { + av_packet_unref(pkt); + continue; + } + + printf("Stream ID: %d, packet PTS: %s, packet DTS: %s\n", + pkt->stream_index, av_ts2str(pkt->pts), av_ts2str(pkt->dts)); + + if (st->event_flags & AVSTREAM_EVENT_FLAG_METADATA_UPDATED) { + result = av_dict_get_string(st->metadata, &metadata, '=', ':'); + if (result < 0) + goto end; + + printf("Stream ID: %d, new metadata: %s\n", pkt->stream_index, + strlen(metadata) ? metadata : "N/A"); + + st->event_flags &= ~AVSTREAM_EVENT_FLAG_METADATA_UPDATED; + } + + result = avcodec_send_packet(ctx, pkt); + av_packet_unref(pkt); + + if (result < 0) + goto end; + + result = avcodec_receive_frame(ctx, fr); + if (result == AVERROR_EOF) { + result = 0; + goto end; + } + + if (result == AVERROR(EAGAIN)) + continue; + + result = av_dict_get_string(fr->metadata, &metadata, '=', ':'); + if (result < 0) + goto end; + + printf("Stream ID: %d, frame PTS: %s, metadata: %s\n", + pkt->stream_index, av_ts2str(fr->pts), + strlen(metadata) ? metadata : "N/A"); + } + +end: + av_packet_free(&pkt); + av_frame_free(&fr); + avformat_close_input(&fmt_ctx); + avcodec_free_context(&ctx); + return result; +} + +int main(int argc, char **argv) { + if (argc < 2) { + av_log(NULL, AV_LOG_ERROR, "Incorrect input\n"); + return 1; + } + + if (dump_stream_meta(argv[1]) != AVERROR_EOF) + return 1; + + return 0; +} -- 2.39.5 (Apple Git-154)
--- tests/Makefile | 1 + tests/fate/ogg-vorbis.mak | 11 +++++++++++ tests/ref/fate/ogg-vorbis-chained-meta.txt | 17 +++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 tests/fate/ogg-vorbis.mak create mode 100644 tests/ref/fate/ogg-vorbis-chained-meta.txt diff --git a/tests/Makefile b/tests/Makefile index 1f7e5003c2..cffa586e8d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -219,6 +219,7 @@ include $(SRC_PATH)/tests/fate/mpeg4.mak include $(SRC_PATH)/tests/fate/mpegps.mak include $(SRC_PATH)/tests/fate/mpegts.mak include $(SRC_PATH)/tests/fate/mxf.mak +include $(SRC_PATH)/tests/fate/ogg-vorbis.mak include $(SRC_PATH)/tests/fate/oma.mak include $(SRC_PATH)/tests/fate/opus.mak include $(SRC_PATH)/tests/fate/pcm.mak diff --git a/tests/fate/ogg-vorbis.mak b/tests/fate/ogg-vorbis.mak new file mode 100644 index 0000000000..74805d591e --- /dev/null +++ b/tests/fate/ogg-vorbis.mak @@ -0,0 +1,11 @@ +FATE_OGG_VORBIS += fate-ogg-vorbis-chained-meta +fate-ogg-vorbis-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt +fate-ogg-vorbis-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg + +FATE_OGG_VORBIS-$(call DEMDEC, OGG, VORBIS) += $(FATE_OGG_VORBIS) + +FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_VORBIS-yes) + +FATE_EXTERN += $(FATE_OGG_VORBIS-yes) + +fate-ogg-vorbis: $(FATE_OGG_VORBIS-yes) diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt new file mode 100644 index 0000000000..71514819b4 --- /dev/null +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt @@ -0,0 +1,17 @@ +Stream ID: 0, codec name: vorbis, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream +Stream ID: 0, packet PTS: 128, packet DTS: 128 +Stream ID: 0, frame PTS: 128, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream +Stream ID: 0, packet PTS: 704, packet DTS: 704 +Stream ID: 0, frame PTS: 704, metadata: N/A +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream +Stream ID: 0, packet PTS: 128, packet DTS: 128 +Stream ID: 0, frame PTS: 128, metadata: N/A +Stream ID: 0, packet PTS: 704, packet DTS: 704 +Stream ID: 0, frame PTS: 704, metadata: N/A -- 2.39.5 (Apple Git-154)
--- libavformat/oggdec.h | 14 ++++++++++++++ libavformat/oggparsevorbis.c | 25 +++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 43df23f4cb..c8460a66e9 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -151,6 +151,20 @@ int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st, const uint8_t *buf, int size); +/** + * Parse Vorbis comments, add metadata to an AVStream + * + * This function also attaches the metadata to the next decoded + * packet as AV_PKT_DATA_METADATA_UPDATE + * + * @note The buffer will be temporarily modifed by this function, + * so it needs to be writable. Furthermore it must be padded + * by a single byte (not counted in size). + * All changes will have been reverted upon return. + */ +int ff_vorbis_update_metadata(AVFormatContext *s, AVStream *st, + const uint8_t *buf, int size); + static inline int ogg_find_stream (struct ogg * ogg, int serial) { diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 9f50ab9ffc..308deb7feb 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -263,20 +263,16 @@ static void vorbis_cleanup(AVFormatContext *s, int idx) } } -static int vorbis_update_metadata(AVFormatContext *s, int idx) +int ff_vorbis_update_metadata(AVFormatContext *s, AVStream *st, + const uint8_t *buf, int size) { struct ogg *ogg = s->priv_data; - struct ogg_stream *os = ogg->streams + idx; - AVStream *st = s->streams[idx]; + struct ogg_stream *os = ogg->streams + st->index; int ret; - if (os->psize <= 8) - return 0; - /* New metadata packet; release old data. */ av_dict_free(&st->metadata); - ret = ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 7, - os->psize - 8); + ret = ff_vorbis_stream_comment(s, st, buf, size); if (ret < 0) return ret; @@ -293,6 +289,19 @@ static int vorbis_update_metadata(AVFormatContext *s, int idx) return ret; } +static int vorbis_update_metadata(AVFormatContext *s, int idx) +{ + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; + AVStream *st = s->streams[idx]; + + if (os->psize <= 8) + return 0; + + return ff_vorbis_update_metadata(s, st, os->buf + os->pstart + 7, + os->psize - 8); +} + static int vorbis_header(AVFormatContext *s, int idx) { struct ogg *ogg = s->priv_data; -- 2.39.5 (Apple Git-154)
--- libavformat/oggparseflac.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index f25ed9cc15..29f5904575 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -78,6 +78,25 @@ flac_header (AVFormatContext * s, int idx) return 1; } +static int +flac_packet (AVFormatContext * s, int idx) +{ + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; + AVStream *st = s->streams[idx]; + int ret; + + if (os->psize > 0 && os->buf[os->pstart] && + (os->buf[os->pstart] & 0x7F) == FLAC_METADATA_TYPE_VORBIS_COMMENT) { + ret = ff_vorbis_update_metadata(s, st, os->buf + os->pstart + 4, + os->psize - 4); + if (ret < 0) + return ret; + } + + return 0; +} + static int old_flac_header (AVFormatContext * s, int idx) { @@ -130,6 +149,7 @@ const struct ogg_codec ff_flac_codec = { .magic = "\177FLAC", .magicsize = 5, .header = flac_header, + .packet = flac_packet, .nb_header = 2, }; @@ -137,5 +157,6 @@ const struct ogg_codec ff_old_flac_codec = { .magic = "fLaC", .magicsize = 4, .header = old_flac_header, + .packet = flac_packet, .nb_header = 0, }; -- 2.39.5 (Apple Git-154)
--- tests/Makefile | 1 + tests/fate/ogg-flac.mak | 11 +++++++++++ tests/ref/fate/ogg-flac-chained-meta.txt | 13 +++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 tests/fate/ogg-flac.mak create mode 100644 tests/ref/fate/ogg-flac-chained-meta.txt diff --git a/tests/Makefile b/tests/Makefile index cffa586e8d..a37f2ab587 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -220,6 +220,7 @@ include $(SRC_PATH)/tests/fate/mpegps.mak include $(SRC_PATH)/tests/fate/mpegts.mak include $(SRC_PATH)/tests/fate/mxf.mak include $(SRC_PATH)/tests/fate/ogg-vorbis.mak +include $(SRC_PATH)/tests/fate/ogg-flac.mak include $(SRC_PATH)/tests/fate/oma.mak include $(SRC_PATH)/tests/fate/opus.mak include $(SRC_PATH)/tests/fate/pcm.mak diff --git a/tests/fate/ogg-flac.mak b/tests/fate/ogg-flac.mak new file mode 100644 index 0000000000..0d6a015161 --- /dev/null +++ b/tests/fate/ogg-flac.mak @@ -0,0 +1,11 @@ +FATE_OGG_FLAC += fate-ogg-flac-chained-meta +fate-ogg-flac-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt +fate-ogg-flac-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg + +FATE_OGG_FLAC-$(call DEMDEC, OGG, FLAC) += $(FATE_OGG_FLAC) + +FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_FLAC-yes) + +FATE_EXTERN += $(FATE_OGG_FLAC-yes) + +fate-ogg-flac: $(FATE_OGG_FLAC-yes) diff --git a/tests/ref/fate/ogg-flac-chained-meta.txt b/tests/ref/fate/ogg-flac-chained-meta.txt new file mode 100644 index 0000000000..9c5d4fca0c --- /dev/null +++ b/tests/ref/fate/ogg-flac-chained-meta.txt @@ -0,0 +1,13 @@ +Stream ID: 0, codec name: flac, metadata: encoder=Lavc61.19.100 flac:title=First Stream +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, new metadata: encoder=Lavc61.19.100 flac:title=First Stream +Stream ID: 0, frame PTS: 0, metadata: N/A +Stream ID: 0, packet PTS: 4608, packet DTS: 4608 +Stream ID: 0, frame PTS: 4608, metadata: N/A +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, new metadata: encoder=Lavc61.19.100 flac:title=Second Stream +Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 flac:title=Second Stream +Stream ID: 0, packet PTS: 4608, packet DTS: 4608 +Stream ID: 0, frame PTS: 4608, metadata: N/A -- 2.39.5 (Apple Git-154)
--- libavformat/oggparseopus.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 218e9df581..fe25ad44f3 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -29,6 +29,7 @@ struct oggopus_private { int need_comments; + int comments_parsed; unsigned pre_skip; int64_t cur_dts; }; @@ -81,7 +82,17 @@ static int opus_header(AVFormatContext *avf, int idx) if (priv->need_comments) { if (os->psize < 8 || memcmp(packet, "OpusTags", 8)) return AVERROR_INVALIDDATA; - ff_vorbis_stream_comment(avf, st, packet + 8, os->psize - 8); + + if (!priv->comments_parsed) { + ff_vorbis_stream_comment(avf, st, packet + 8, os->psize - 8); + priv->comments_parsed = 1; + } else { + ret = ff_vorbis_update_metadata(avf, st, packet + 8, os->psize - 8); + + if (ret < 0) + return ret; + } + priv->need_comments--; return 1; } -- 2.39.5 (Apple Git-154)
--- tests/Makefile | 1 + tests/fate/ogg-opus.mak | 11 ++++++++++ tests/ref/fate/ogg-opus-chained-meta.txt | 27 ++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 tests/fate/ogg-opus.mak create mode 100644 tests/ref/fate/ogg-opus-chained-meta.txt diff --git a/tests/Makefile b/tests/Makefile index a37f2ab587..75b9bcc729 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -221,6 +221,7 @@ include $(SRC_PATH)/tests/fate/mpegts.mak include $(SRC_PATH)/tests/fate/mxf.mak include $(SRC_PATH)/tests/fate/ogg-vorbis.mak include $(SRC_PATH)/tests/fate/ogg-flac.mak +include $(SRC_PATH)/tests/fate/ogg-opus.mak include $(SRC_PATH)/tests/fate/oma.mak include $(SRC_PATH)/tests/fate/opus.mak include $(SRC_PATH)/tests/fate/pcm.mak diff --git a/tests/fate/ogg-opus.mak b/tests/fate/ogg-opus.mak new file mode 100644 index 0000000000..54b6fbabde --- /dev/null +++ b/tests/fate/ogg-opus.mak @@ -0,0 +1,11 @@ +FATE_OGG_OPUS += fate-ogg-opus-chained-meta +fate-ogg-opus-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-opus-chained-meta.txt +fate-ogg-opus-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-opus/chained-meta.ogg + +FATE_OGG_OPUS-$(call DEMDEC, OGG, OPUS) += $(FATE_OGG_OPUS) + +FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_OPUS-yes) + +FATE_EXTERN += $(FATE_OGG_OPUS-yes) + +fate-ogg-opus: $(FATE_OGG_OPUS-yes) diff --git a/tests/ref/fate/ogg-opus-chained-meta.txt b/tests/ref/fate/ogg-opus-chained-meta.txt new file mode 100644 index 0000000000..aad9b83700 --- /dev/null +++ b/tests/ref/fate/ogg-opus-chained-meta.txt @@ -0,0 +1,27 @@ +Stream ID: 0, codec name: opus, metadata: encoder=Lavc61.19.100 libopus:title=First Stream +Stream ID: 0, packet PTS: -312, packet DTS: -312 +Stream ID: 0, new metadata: encoder=Lavc61.19.100 libopus:title=First Stream +Stream ID: 0, frame PTS: -312, metadata: N/A +Stream ID: 0, packet PTS: 648, packet DTS: 648 +Stream ID: 0, frame PTS: 648, metadata: N/A +Stream ID: 0, packet PTS: 1608, packet DTS: 1608 +Stream ID: 0, frame PTS: 1608, metadata: N/A +Stream ID: 0, packet PTS: 2568, packet DTS: 2568 +Stream ID: 0, frame PTS: 2568, metadata: N/A +Stream ID: 0, packet PTS: 3528, packet DTS: 3528 +Stream ID: 0, frame PTS: 3528, metadata: N/A +Stream ID: 0, packet PTS: 4488, packet DTS: 4488 +Stream ID: 0, frame PTS: 4488, metadata: N/A +Stream ID: 0, packet PTS: -312, packet DTS: -312 +Stream ID: 0, new metadata: encoder=Lavc61.19.100 libopus:title=Second Stream +Stream ID: 0, frame PTS: -312, metadata: encoder=Lavc61.19.100 libopus:title=Second Stream +Stream ID: 0, packet PTS: 648, packet DTS: 648 +Stream ID: 0, frame PTS: 648, metadata: N/A +Stream ID: 0, packet PTS: 1608, packet DTS: 1608 +Stream ID: 0, frame PTS: 1608, metadata: N/A +Stream ID: 0, packet PTS: 2568, packet DTS: 2568 +Stream ID: 0, frame PTS: 2568, metadata: N/A +Stream ID: 0, packet PTS: 3528, packet DTS: 3528 +Stream ID: 0, frame PTS: 3528, metadata: N/A +Stream ID: 0, packet PTS: 4488, packet DTS: 4488 +Stream ID: 0, frame PTS: 4488, metadata: N/A -- 2.39.5 (Apple Git-154)
Hi! Le mar. 15 avr. 2025 à 17:22, Romain Beauxis <romain.beauxis@gmail.com> a écrit :
This is a series of patches to allow proper decoding of ogg metadata in
chained
`ogg/vorbis, `ogg/flac` and `ogg/opus` streams.
Samples are available at: https://www.dropbox.com/scl/fo/xrtrna2rxr1j354hrtymq/AGwemlxHYecBLNmQ8Fsy--4?rlkey=lzilr4m9w4gfdqygoe172vvy8&dl=0
## Changes since last version: * Reverted metadata decoding logic to the previous, simpler implementation.
Any opinion on this? Thanks! -- Romain
Romain Beauxis (8): libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` packet extra data, attach them to the next decoded frame. tests: Add stream dump test API util. tests: Add chained ogg/vorbis stream dump test. libavformat/oggdec.h, libavformat/oggparsevorbis.c: Factor out vorbis metadata update mechanism. libavformat/oggparseflac.c: Parse ogg/flac comments in new ogg packets, add them to ogg stream new_metadata. tests: Add chained ogg/flac stream dump test. libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet. tests: Add chained ogg/opus stream dump test.
libavcodec/decode.c | 19 +++ libavformat/oggdec.h | 14 ++ libavformat/oggparseflac.c | 21 +++ libavformat/oggparseopus.c | 13 +- libavformat/oggparsevorbis.c | 25 ++- tests/Makefile | 4 + tests/api/Makefile | 2 +- tests/api/api-dump-stream-meta-test.c | 177 +++++++++++++++++++++ tests/fate/ogg-flac.mak | 11 ++ tests/fate/ogg-opus.mak | 11 ++ tests/fate/ogg-vorbis.mak | 11 ++ tests/ref/fate/ogg-flac-chained-meta.txt | 13 ++ tests/ref/fate/ogg-opus-chained-meta.txt | 27 ++++ tests/ref/fate/ogg-vorbis-chained-meta.txt | 17 ++ 14 files changed, 355 insertions(+), 10 deletions(-) create mode 100644 tests/api/api-dump-stream-meta-test.c create mode 100644 tests/fate/ogg-flac.mak create mode 100644 tests/fate/ogg-opus.mak create mode 100644 tests/fate/ogg-vorbis.mak create mode 100644 tests/ref/fate/ogg-flac-chained-meta.txt create mode 100644 tests/ref/fate/ogg-opus-chained-meta.txt create mode 100644 tests/ref/fate/ogg-vorbis-chained-meta.txt
-- 2.39.5 (Apple Git-154)
participants (2)
-
Michael Niedermayer -
Romain Beauxis