From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 113494DAF0
for <ffmpegdev@gitmailbox.com>; Tue, 22 Apr 2025 21:45:46 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC461687F0E;
Wed, 23 Apr 2025 00:45:43 +0300 (EEST)
Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com
[209.85.160.51])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F639687C7C
for <ffmpeg-devel@ffmpeg.org>; Wed, 23 Apr 2025 00:45:37 +0300 (EEST)
Received: by mail-oa1-f51.google.com with SMTP id
586e51a60fabf-2c2ada8264aso2895031fac.2
for <ffmpeg-devel@ffmpeg.org>; Tue, 22 Apr 2025 14:45:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745358335; x=1745963135; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=FzhZGlKJIj1VXaQppc12WYwupB6D+u1JNkGWoJmA5mU=;
b=D20fxBfR89Jvk8vQ+z9pySXKLoHRVMH/oHrZ20LcSOkZX12FmsjLyl0bx/x5kufR3y
OiwKzyZaZG7dFHRQ/WmsVAKtg+nkS9kz08Lz2kqfzG1NmNCkaDObAaLPjrLB8mfYUk6P
bPuS7ray2jft5BtX8IHwRvevdVNX7mCnTVtKhdAWG1jagHJp5h6yAsTycF9Pq9cd+tlx
Yh/MzIQm5uyWCacg9ru7P/7s4gjhKy6oP4oRzmhy2LQPTfp6/MLyBYk8zGfkdZ6kthdj
mZVLnhbd2lxgbw7u94CU/WJOtjaTSYD1W/4FloETjfCKYd2XnJzFBm3wbxzljCnIvmgn
D7vA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745358335; x=1745963135;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=FzhZGlKJIj1VXaQppc12WYwupB6D+u1JNkGWoJmA5mU=;
b=FoII8XpT7eMGaXsUPBuqh3aLY9HNQnnsA6xO53Ls6YR9EJozwM762PE6p0kEw5k+XX
yWYDouGqScpgrK08ckYO7UINNJo5uM0C1atlDWprlxgNuieamBDFwLH+poB15sHZcz0/
moPbamnr0cyhgsxtYB8CfRD4XJxPALYgEPxFBcP/7JDTFBa188A8OYrLixbYbfSomAii
SsmML2S7+Gdh+AP05Ow/uy+TUyDj8uD6V/XL6dg0q8rjwac5q4pvE8Uu5Z5QmiyHFq62
PhthpA/gNgSqznpx076hfePTTeeMsOFbq7/vc03NyrPyUG1eq37vbm6PEymE9BGAqLKf
BE6w==
X-Gm-Message-State: AOJu0YzMPbiXliD6ajhMN64exonQyGbQS3yl3KArvUYo1jjB3eYfDvfH
cObw4TEvzvCOU6rT+KSqKIfQFZ9cKUXnQ+rHPOYbNFJPq9IfM5loOLIWCftt
X-Gm-Gg: ASbGncs2DR36OAEz9dWPz1x4L9KMzzEtSkYowrMitAoeDON1JqESmAJSMbF3Q77qbzJ
jHbE1wt8zv2DZMW96SzUKjWWdly1Dm5nwusKt883XUwSVrsNdfVgYYqZsFFIKdF7/Q8tqSGyq6H
ikihvZm98HueykB0EylpB+1cRrNQuKX5fPsibF+iDRqbhFs3DgwxFZv+p7tuCs6b3FSQFuuVC5P
4yu6+UA3Hv5Pg7eRWpvHE7wcI8o8luZPVRdU/b2KCf9WAVdSMKBNKO5uNu0vNHevVMksLRC51e6
kC72vgn6GO8+7j3TFq2W7gfBZSV5lQFO/lFdNhvcf4n86EUGBI7+BqZ/4sdRt5lEID3gOGl3GNN
JiAqWQ+Ot
X-Google-Smtp-Source: AGHT+IHpfoHZvb9oToOiDZkkzP8c03VjFJP/cg1l+oXb/LajSDWnL3peuYNh4uBat/2ThgOeUHJcew==
X-Received: by 2002:a05:6870:3c0f:b0:2c2:561c:47e3 with SMTP id
586e51a60fabf-2d526af6320mr11075382fac.21.1745358335316;
Tue, 22 Apr 2025 14:45:35 -0700 (PDT)
Received: from mac.lan (ip72-211-125-114.no.no.cox.net. [72.211.125.114])
by smtp.gmail.com with ESMTPSA id
586e51a60fabf-2d52178ddcfsm2834427fac.38.2025.04.22.14.45.34
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Tue, 22 Apr 2025 14:45:34 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 22 Apr 2025 16:44:08 -0500
Message-Id: <20250422214408.10102-3-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250422214408.10102-1-romain.beauxis@gmail.com>
References: <20250422214408.10102-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 2/2] ogg/{vorbis, flac,
opus}: Remove header packets from subsequent ogg streams from the
demuxer output.
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Romain Beauxis <romain.beauxis@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250422214408.10102-3-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavformat/oggdec.c | 26 ++++++++++----------
libavformat/oggdec.h | 6 +++++
libavformat/oggparseflac.c | 28 ++++++++++++++++++++--
libavformat/oggparseopus.c | 12 ++++++++++
libavformat/oggparsevorbis.c | 4 +++-
tests/ref/fate/ogg-flac-chained-meta.txt | 2 --
tests/ref/fate/ogg-opus-chained-meta.txt | 1 -
tests/ref/fate/ogg-vorbis-chained-meta.txt | 3 ---
8 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 5339fdd32c..5557eb4a14 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -239,10 +239,6 @@ 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)
- os->header = -1;
-
return i;
}
@@ -605,20 +601,26 @@ static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize,
} else {
os->pflags = 0;
os->pduration = 0;
+
+ ret = 0;
if (os->codec && os->codec->packet) {
if ((ret = os->codec->packet(s, idx)) < 0) {
av_log(s, AV_LOG_ERROR, "Packet processing failed: %s\n", av_err2str(ret));
return ret;
}
}
- if (sid)
- *sid = idx;
- if (dstart)
- *dstart = os->pstart;
- if (dsize)
- *dsize = os->psize;
- if (fpos)
- *fpos = os->sync_pos;
+
+ if (!ret) {
+ if (sid)
+ *sid = idx;
+ if (dstart)
+ *dstart = os->pstart;
+ if (dsize)
+ *dsize = os->psize;
+ if (fpos)
+ *fpos = os->sync_pos;
+ }
+
os->pstart += os->psize;
os->psize = 0;
if(os->pstart == os->bufpos)
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 43df23f4cb..09f698f99a 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -38,6 +38,12 @@ struct ogg_codec {
* -1 if an error occurred or for unsupported stream
*/
int (*header)(AVFormatContext *, int);
+ /**
+ * Attempt to process a packet as a data packet
+ * @return 1 if the packet was a header from a chained bitstream.
+ * 0 if the packet was a regular data packet.
+ * -1 if an error occurred or for unsupported stream
+ */
int (*packet)(AVFormatContext *, int);
/**
* Translate a granule into a timestamp.
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index f25ed9cc15..d66b85b09e 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -27,6 +27,8 @@
#include "oggdec.h"
#define OGG_FLAC_METADATA_TYPE_STREAMINFO 0x7F
+#define OGG_FLAC_MAGIC "\177FLAC"
+#define OGG_FLAC_MAGIC_SIZE sizeof(OGG_FLAC_MAGIC)-1
static int
flac_header (AVFormatContext * s, int idx)
@@ -78,6 +80,27 @@ 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;
+
+ if (os->psize > OGG_FLAC_MAGIC_SIZE &&
+ !memcmp(
+ os->buf + os->pstart,
+ OGG_FLAC_MAGIC,
+ OGG_FLAC_MAGIC_SIZE))
+ return 1;
+
+ if (os->psize > 0 &&
+ ((os->buf[os->pstart] & 0x7F) == FLAC_METADATA_TYPE_VORBIS_COMMENT)) {
+ return 1;
+ }
+
+ return 0;
+}
+
static int
old_flac_header (AVFormatContext * s, int idx)
{
@@ -127,10 +150,11 @@ fail:
}
const struct ogg_codec ff_flac_codec = {
- .magic = "\177FLAC",
- .magicsize = 5,
+ .magic = OGG_FLAC_MAGIC,
+ .magicsize = OGG_FLAC_MAGIC_SIZE,
.header = flac_header,
.nb_header = 2,
+ .packet = flac_packet,
};
const struct ogg_codec ff_old_flac_codec = {
diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c
index 218e9df581..07ddba8c82 100644
--- a/libavformat/oggparseopus.c
+++ b/libavformat/oggparseopus.c
@@ -81,6 +81,7 @@ 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);
priv->need_comments--;
return 1;
@@ -125,6 +126,17 @@ static int opus_packet(AVFormatContext *avf, int idx)
return AVERROR_INVALIDDATA;
}
+ if (os->psize > 8 && !memcmp(packet, "OpusHead", 8)) {
+ if ((ret = ff_alloc_extradata(st->codecpar, os->psize)) < 0)
+ return ret;
+
+ memcpy(st->codecpar->extradata, packet, os->psize);
+ return 1;
+ }
+
+ if (os->psize > 8 && !memcmp(packet, "OpusTags", 8))
+ return 1;
+
if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) {
int seg, d;
int duration;
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 9f50ab9ffc..b5ed41bca0 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -418,6 +418,7 @@ static int vorbis_packet(AVFormatContext *s, int idx)
struct ogg_stream *os = ogg->streams + idx;
struct oggvorbis_private *priv = os->private;
int duration, flags = 0;
+ int skip_packet = 0;
if (!priv->vp)
return AVERROR_INVALIDDATA;
@@ -430,6 +431,7 @@ static int vorbis_packet(AVFormatContext *s, int idx)
int seg, d;
uint8_t *last_pkt = os->buf + os->pstart;
uint8_t *next_pkt = last_pkt;
+ skip_packet = 1;
av_vorbis_parse_reset(priv->vp);
duration = 0;
@@ -505,7 +507,7 @@ static int vorbis_packet(AVFormatContext *s, int idx)
priv->final_duration += os->pduration;
}
- return 0;
+ return skip_packet;
}
const struct ogg_codec ff_vorbis_codec = {
diff --git a/tests/ref/fate/ogg-flac-chained-meta.txt b/tests/ref/fate/ogg-flac-chained-meta.txt
index ad20ba935f..28e22aa29e 100644
--- a/tests/ref/fate/ogg-flac-chained-meta.txt
+++ b/tests/ref/fate/ogg-flac-chained-meta.txt
@@ -5,8 +5,6 @@ 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, packet PTS: 0, packet DTS: 0
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
diff --git a/tests/ref/fate/ogg-opus-chained-meta.txt b/tests/ref/fate/ogg-opus-chained-meta.txt
index fc84b8b703..addc41c1eb 100644
--- a/tests/ref/fate/ogg-opus-chained-meta.txt
+++ b/tests/ref/fate/ogg-opus-chained-meta.txt
@@ -13,7 +13,6 @@ 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;Lavc61.19.100 libopus:title=First Stream;Second 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
diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt
index b7a97c90e2..1206f86c1f 100644
--- a/tests/ref/fate/ogg-vorbis-chained-meta.txt
+++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt
@@ -6,10 +6,7 @@ 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
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: N/A
Stream ID: 0, packet PTS: 128, packet DTS: 128
Stream ID: 0, frame PTS: 128, metadata: N/A
--
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".