From: Romain Beauxis <romain.beauxis@gmail.com> To: ffmpeg-devel@ffmpeg.org Cc: Romain Beauxis <romain.beauxis@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 8/9] libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet. Date: Tue, 18 Feb 2025 23:24:44 -0600 Message-ID: <20250219052445.86383-9-romain.beauxis@gmail.com> (raw) In-Reply-To: <20250219052445.86383-1-romain.beauxis@gmail.com> --- 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) _______________________________________________ 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-02-19 5:26 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2025-02-19 5:24 [FFmpeg-devel] [PATCH v6 0/9] Properly decode ogg metadata in ogg/{vorbis, flac, opus} chained bitstreams Romain Beauxis 2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 1/9] libavcodec/decode.c: Add generic metadata injection using AV_PKT_DATA_METADATA_UPDATE Romain Beauxis 2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 2/9] tests: Add stream dump test API util Romain Beauxis 2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 3/9] libavformat/oggparsevorbis.c: Don't append new metadata Romain Beauxis 2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 4/9] tests: Add chained ogg/vorbis stream dump test Romain Beauxis 2025-02-19 17:53 ` Romain Beauxis 2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 5/9] libavformat/oggdec.h, libavformat/oggparsevorbis.c: Factor out vorbis metadata update mechanism Romain Beauxis 2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 6/9] libavformat/oggparseflac.c: Parse ogg/flac comments in new ogg packets, add them to ogg stream new_metadata Romain Beauxis 2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 7/9] tests: Add chained ogg/flac stream dump test Romain Beauxis 2025-02-21 11:01 ` Michael Niedermayer 2025-02-21 15:40 ` Romain Beauxis 2025-02-19 5:24 ` Romain Beauxis [this message] 2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 9/9] tests: Add chained ogg/opus " Romain Beauxis 2025-02-19 18:17 ` [FFmpeg-devel] [PATCH v6 0/9] Properly decode ogg metadata in ogg/{vorbis, flac, opus} chained bitstreams Lynne 2025-02-19 18:57 ` Romain Beauxis 2025-02-21 15:41 ` 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=20250219052445.86383-9-romain.beauxis@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