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 9D3884C8B6
for <ffmpegdev@gitmailbox.com>; Fri, 9 May 2025 23:44:26 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EDC8E68C76D;
Sat, 10 May 2025 02:44:12 +0300 (EEST)
Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com
[209.85.161.53])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D745F68C6B5
for <ffmpeg-devel@ffmpeg.org>; Sat, 10 May 2025 02:43:44 +0300 (EEST)
Received: by mail-oo1-f53.google.com with SMTP id
006d021491bc7-6062e41916dso1310110eaf.1
for <ffmpeg-devel@ffmpeg.org>; Fri, 09 May 2025 16:43:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1746834223; x=1747439023; 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=MbMPe6tf/hh0aE3520r3sPW8HpzEey1eQukoN9vSAmc=;
b=H7aZ7fkTFcFYXqu9fmlyZFt7TqMXaKpHJOZ/WA2fVRSzLLn/8TSw7bCpGHasjubUQN
XU8SAweWFU9WZ0nD/cZES+re6Vok3x1aS2A2heztyltjoSwk7Am9Mm8OkduIeXEgUzPG
Bw+oLq5/tCxSBhZ4Q17I2xPtaCLD8tacAW6CdyHL0O4954ZcKRdn1naLKqfT+KLeklym
xjk+fuwL2+dVIKJ8sWVaTAdxolt8xGoJO3/LuXSiHvUiODfP+4kDfcjx3ujcWq/9qQFd
xuYY2sx3M8nYrBdmFBTOHc7AHqtNRTRCml+nwYFWql8nyT1Ovmzu3nj356XqnlG7Q8fv
9nSw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1746834223; x=1747439023;
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=MbMPe6tf/hh0aE3520r3sPW8HpzEey1eQukoN9vSAmc=;
b=ZzTJ/jHPteXA7aF95eFVXjc6sjMhnSLMWjaWCuGqJKbIFoTzbKcC0xkNSyHQKdH4ZC
IyFP0c59p7XDeUPbzfMeA4JuJH6FYcoQmq26gfECMBB7X9/4rKmTICiXfjLV3z+jxqlz
nmqrOxxWARxBxP5Zfqu+0cbESTRlQN0F4XH5hlopZQ9RiUwcurVbBjZVl77689MWCX5h
udvvxtdtqtXI7eBcLCYJrUWOCJ6bM08CzEGz4B1YgW6SDsY3usjSVQAvfVaGTNeP9P96
mdxXuG49KAfbrZkCdG6LbT+HNBzY0lYklkWROWtwE3OL9HQpVYhbCCKMnrfpKQzHJrCP
Qevg==
X-Gm-Message-State: AOJu0Yyk/fjmEKx1TPn77o1Tm3nq4hUtpJrFLHT7dnDXCdIrK7ypL6r/
TAOpuCcGUvD9MPytc7DweHtAvkviop6vOFAe03VCrfpLiSFPWwrk1K/rU0xp
X-Gm-Gg: ASbGncsi6494KS2s5/JoQN8bdRoKdvIetMMPnkA2xuujY+oxcOD+cxHj7bpJAB7Fi37
5iahx0OIra03/vJUQm24zSSdDmY8kbgwOFXux1OVYa+aheG27Sq2Q8L4u5SzbFU+0Clxl4w3fUs
Wr0pM3QOCcV8euwi1TkaJQzr0XOhlEQdOw+dAYpbc0/vXPnDGRvyx3AjR/xoRoCQfReh4Dsp/wL
AkTVuv4+1mhfq2HPcgaoMewxHSXyBNJiRaeEUbwdY1JXYp2rMej+4DTl4C9Y1JBHa5zf+ogL6CZ
59NBmDeJS5ArJ91qdHZof4kVeTu5CTg+Esr5XI/M9K10a+4C2Po2ejsfNV1RazOjgeadXjGtr9O
RYtXu/7E0qlMwU1SV6i1XFSbZc90=
X-Google-Smtp-Source: AGHT+IHOXztM+uQM+Cta1N9w6Phjmmwy0upaFODijHec/2QVZhfw+f8Hl3dE5AogDsmvydzYc6tbjQ==
X-Received: by 2002:a4a:e849:0:b0:607:dd61:9c33 with SMTP id
006d021491bc7-6083ff131f9mr3594520eaf.1.1746834223089;
Fri, 09 May 2025 16:43:43 -0700 (PDT)
Received: from localhost.localdomain
([2607:fb90:e33e:5272:5990:2d1e:9f2e:c4de])
by smtp.gmail.com with ESMTPSA id
006d021491bc7-6083fe52271sm668499eaf.21.2025.05.09.16.43.41
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Fri, 09 May 2025 16:43:42 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 9 May 2025 18:43:23 -0500
Message-Id: <20250509234327.71039-4-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250509234327.71039-1-romain.beauxis@gmail.com>
References: <20250509234327.71039-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v5 3/7] ogg/opus: implement header packet
skip in chained ogg bitstreams.
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/20250509234327.71039-4-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavformat/oggdec.c | 4 --
libavformat/oggparseopus.c | 87 ++++++++++++++++--------
tests/ref/fate/ogg-opus-chained-meta.txt | 1 -
3 files changed, 60 insertions(+), 32 deletions(-)
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 9baf8040a9..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;
}
diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c
index 218e9df581..65b93b4053 100644
--- a/libavformat/oggparseopus.c
+++ b/libavformat/oggparseopus.c
@@ -36,6 +36,51 @@ struct oggopus_private {
#define OPUS_SEEK_PREROLL_MS 80
#define OPUS_HEAD_SIZE 19
+static int parse_opus_header(AVFormatContext *avf, AVStream *st, struct ogg_stream *os,
+ struct oggopus_private *priv, uint8_t *packet,
+ size_t psize)
+{
+ int channels;
+ int ret;
+
+ if (psize < OPUS_HEAD_SIZE || (AV_RL8(packet + 8) & 0xF0) != 0)
+ return AVERROR_INVALIDDATA;
+
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = AV_CODEC_ID_OPUS;
+
+ channels = AV_RL8(packet + 9);
+ if (st->codecpar->ch_layout.nb_channels &&
+ channels != st->codecpar->ch_layout.nb_channels) {
+ av_log(avf, AV_LOG_ERROR, "Channel change is not supported\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ st->codecpar->ch_layout.nb_channels = channels;
+
+ priv->pre_skip = AV_RL16(packet + 10);
+ st->codecpar->initial_padding = priv->pre_skip;
+ os->start_trimming = priv->pre_skip;
+ /*orig_sample_rate = AV_RL32(packet + 12);*/
+ /*gain = AV_RL16(packet + 16);*/
+ /*channel_map = AV_RL8 (packet + 18);*/
+
+ ret = ff_alloc_extradata(st->codecpar, os->psize);
+ if (ret < 0)
+ return ret;
+
+ memcpy(st->codecpar->extradata, packet, os->psize);
+
+ st->codecpar->sample_rate = 48000;
+ st->codecpar->seek_preroll = av_rescale(OPUS_SEEK_PREROLL_MS,
+ st->codecpar->sample_rate, 1000);
+ avpriv_set_pts_info(st, 64, 1, 48000);
+
+ priv->need_comments = 1;
+
+ return 1;
+}
+
static int opus_header(AVFormatContext *avf, int idx)
{
struct ogg *ogg = avf->priv_data;
@@ -43,7 +88,6 @@ static int opus_header(AVFormatContext *avf, int idx)
AVStream *st = avf->streams[idx];
struct oggopus_private *priv = os->private;
uint8_t *packet = os->buf + os->pstart;
- int ret;
if (!priv) {
priv = os->private = av_mallocz(sizeof(*priv));
@@ -51,32 +95,8 @@ static int opus_header(AVFormatContext *avf, int idx)
return AVERROR(ENOMEM);
}
- if (os->flags & OGG_FLAG_BOS) {
- if (os->psize < OPUS_HEAD_SIZE || (AV_RL8(packet + 8) & 0xF0) != 0)
- return AVERROR_INVALIDDATA;
- st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codecpar->codec_id = AV_CODEC_ID_OPUS;
- st->codecpar->ch_layout.nb_channels = AV_RL8(packet + 9);
-
- priv->pre_skip = AV_RL16(packet + 10);
- st->codecpar->initial_padding = priv->pre_skip;
- os->start_trimming = priv->pre_skip;
- /*orig_sample_rate = AV_RL32(packet + 12);*/
- /*gain = AV_RL16(packet + 16);*/
- /*channel_map = AV_RL8 (packet + 18);*/
-
- if ((ret = ff_alloc_extradata(st->codecpar, os->psize)) < 0)
- return ret;
-
- memcpy(st->codecpar->extradata, packet, os->psize);
-
- st->codecpar->sample_rate = 48000;
- st->codecpar->seek_preroll = av_rescale(OPUS_SEEK_PREROLL_MS,
- st->codecpar->sample_rate, 1000);
- avpriv_set_pts_info(st, 64, 1, 48000);
- priv->need_comments = 1;
- return 1;
- }
+ if (os->flags & OGG_FLAG_BOS)
+ return parse_opus_header(avf, st, os, priv, packet, os->psize);
if (priv->need_comments) {
if (os->psize < 8 || memcmp(packet, "OpusTags", 8))
@@ -125,6 +145,19 @@ static int opus_packet(AVFormatContext *avf, int idx)
return AVERROR_INVALIDDATA;
}
+ if (os->psize > 8 && !memcmp(packet, "OpusHead", 8)) {
+ ret = parse_opus_header(avf, st, os, priv, packet, os->psize);
+ if (ret < 0)
+ return ret;
+
+ return 1;
+ }
+
+ if (os->psize > 8 && !memcmp(packet, "OpusTags", 8)) {
+ priv->need_comments = 0;
+ return 1;
+ }
+
if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) {
int seg, d;
int duration;
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
--
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".