Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Romain Beauxis <romain.beauxis@gmail.com>
Subject: [FFmpeg-devel] [PATCH] Parse ogg/flac header again after processing a new chained ogg bitstream.
Date: Sat, 18 Jan 2025 11:53:13 -0600
Message-ID: <20250118175312.55761-1-romain.beauxis@gmail.com> (raw)

This patch makes sure that ogg/flac headers are parsed again when
encountering a new logic stream inside a chained ogg bistream[1].

This patches makes it possible to retrieve metadata in chained ogg/flac
bitstreams. It is particularly important because ogg/flac is one of the
only (if not the only one) lossless container supported over HTTP/icecast.

The patch has been tested with various ogg/flac encoders and appears to
work fine with ffmpeg.

1: https://xiph.org/ogg/doc/oggstream.html

---
 libavformat/oggdec.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 5339fdd32c..d986e19817 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -239,8 +239,11 @@ static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, char *magic,
     os->start_trimming = 0;
     os->end_trimming = 0;
 
-    /* Chained files have extradata as a new packet */
-    if (codec == &ff_opus_codec)
+    /* Parse opus and flac header on new chained bitstreams.
+     * For opus, header contains required extradata as new packet.
+     * For both formats, this makes it possible to read chained metadata. */
+    if (codec == &ff_opus_codec ||
+        codec == &ff_flac_codec)
         os->header = -1;
 
     return i;
-- 
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".

             reply	other threads:[~2025-01-18 17:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-18 17:53 Romain Beauxis [this message]
2025-01-25  1:40 ` Romain Beauxis
2025-01-27 23:25   ` Michael Niedermayer
2025-01-29 14:38     ` 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=20250118175312.55761-1-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