From: Romain Beauxis <romain.beauxis@gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH v7 1/8] Add generic metadata injection using AV_PKT_DATA_METADATA_UPDATE Date: Mon, 10 Mar 2025 08:50:06 -0500 Message-ID: <CABWZ6OTMaGOs+kC3FKaHydneZDMM5vmQd-HhY6SxA57XuV+4NA@mail.gmail.com> (raw) In-Reply-To: <20250309183143.GJ4991@pb2> Le dim. 9 mars 2025 à 13:31, Michael Niedermayer <michael@niedermayer.cc> a écrit : > > On Tue, Feb 25, 2025 at 04:01:14PM -0600, Romain Beauxis wrote: > > libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` packet > > extra data, attach them to the next decoded frame. > > > > --- > > libavcodec/decode.c | 20 ++++++++++++++++++++ > > 1 file changed, 20 insertions(+) > > > > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > > index cac7e620d2..96e2f0ce95 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) > > @@ -729,6 +731,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)) > > @@ -746,6 +750,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; > > > > @@ -815,6 +827,7 @@ fail: > > int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) > > { > > AVCodecInternal *avci = avctx->internal; > > + DecodeContext *dc = decode_ctx(avci); > > int ret; > > > > if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec)) > > @@ -887,6 +900,12 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) > > } > > } > > #endif > > + > > + 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); > > Does this work correctly, if theres a delay/latency in the decoder ? Can you describe a scenario that you're thinking about? > thx > > [...] > > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Give a rich man 100$ and he will turn it into 1000$. > Give a poor man 1000$ and he will spend it. > _______________________________________________ > 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". _______________________________________________ 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".
next prev parent reply other threads:[~2025-03-10 13:50 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2025-02-25 22:01 [FFmpeg-devel] [PATCH v7 0/8] Properly decode ogg metadata in ogg/{vorbis, flac, opus} chained bitstreams Romain Beauxis 2025-02-25 22:01 ` [FFmpeg-devel] [PATCH v7 1/8] Add generic metadata injection using AV_PKT_DATA_METADATA_UPDATE Romain Beauxis 2025-03-09 18:31 ` Michael Niedermayer 2025-03-10 13:50 ` Romain Beauxis [this message] 2025-03-10 7:13 ` Andreas Rheinhardt 2025-03-10 13:49 ` Romain Beauxis 2025-02-25 22:01 ` [FFmpeg-devel] [PATCH v7 2/8] tests: Add stream dump test API util Romain Beauxis 2025-02-25 22:01 ` [FFmpeg-devel] [PATCH v7 3/8] tests: Add chained ogg/vorbis stream dump test Romain Beauxis 2025-02-25 22:03 ` Romain Beauxis 2025-02-25 22:01 ` [FFmpeg-devel] [PATCH v7 4/8] libavformat/oggdec.h, libavformat/oggparsevorbis.c: Factor out vorbis metadata update mechanism Romain Beauxis 2025-02-25 22:01 ` [FFmpeg-devel] [PATCH v7 5/8] libavformat/oggparseflac.c: Parse ogg/flac comments in new ogg packets, add them to ogg stream new_metadata Romain Beauxis 2025-02-25 22:01 ` [FFmpeg-devel] [PATCH v7 6/8] tests: Add chained ogg/flac stream dump test Romain Beauxis 2025-02-25 22:01 ` [FFmpeg-devel] [PATCH v7 7/8] libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet Romain Beauxis 2025-02-25 22:01 ` [FFmpeg-devel] [PATCH v7 8/8] tests: Add chained ogg/opus stream dump test Romain Beauxis 2025-02-28 19:54 ` [FFmpeg-devel] [PATCH v7 0/8] Properly decode ogg metadata in ogg/{vorbis, flac, opus} chained bitstreams Romain Beauxis 2025-03-07 22:03 ` Romain Beauxis
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CABWZ6OTMaGOs+kC3FKaHydneZDMM5vmQd-HhY6SxA57XuV+4NA@mail.gmail.com \ --to=romain.beauxis@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git