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 780904C4A8
for <ffmpegdev@gitmailbox.com>; Fri, 4 Apr 2025 21:16:38 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A06E68B9FD;
Sat, 5 Apr 2025 00:15:15 +0300 (EEST)
Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com
[209.85.167.178])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67DEF68B9C6
for <ffmpeg-devel@ffmpeg.org>; Sat, 5 Apr 2025 00:15:08 +0300 (EEST)
Received: by mail-oi1-f178.google.com with SMTP id
5614622812f47-3f6eaa017d0so1768895b6e.0
for <ffmpeg-devel@ffmpeg.org>; Fri, 04 Apr 2025 14:15:08 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743801307; x=1744406107; 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=BnUIpGK0NYOqMsAhXf9MxzFmAg16pXSG3UoiHXDfv3A=;
b=bBLeGiWARDSpoEp/dBSiuoCNTgmbvR+P7FrWxiEz9qRAaCE62J0Tt/rYwlL+e4Bg+h
7WdUYrc0JrNqUFCB4fOcXWjPeub7e52o7WdvGlgDqgB38fut9cvOJ3EyfeHmgi8Qmm/X
MK3X67dzh0KPJI6j1nYrS3a5OMf8YVKfpoACVTPqDXeaXQcw4Zfuodvil+PF/M8qMZrf
DTxzia/bDyQq4q4yJhz/drbH2e8Z2MoNzt4J7ZI+vIQE4ysMxsBtplNn5Wt7MDIVrUUK
vpBZgkqikKW03hli7zdfnefUM4Dg0CvmvhDRl+gb6MKivJqaNsX0OLkK/pmPh1oj0lbS
9apA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743801307; x=1744406107;
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=BnUIpGK0NYOqMsAhXf9MxzFmAg16pXSG3UoiHXDfv3A=;
b=dZqfMw/jsMlq0oLUln4BB+OJ7e32xDpDqrF1h2c3UTXjiVNa6KKkhlO1JjcNPLHZZK
Lpavk/i9qwplWMjCLpuaouZqDCBtKOlvb6wdLti9uOjIpRbL6JfHQs4yfmv595RSVixy
g0zD82sWmRbVRPV/VL+3dvmzSAncYa0OftL6Qx3tCOoPJOaJwKvjiJ2eDDJPfRC5ply0
02uP+9GCb6S7tHqgLq8ZP66uEDdrDukySpx1TxOVX0wCMVKKa7bnmUC9mJH4LDJoU0Sa
xj0RbFSJAX1FSqPYpFe1C5tJKHJ3rcKQCR0379qCfgEvhbp3Qpk6CILdQdpWOqh6vAQd
h3Ow==
X-Gm-Message-State: AOJu0Yy4LTaOAL9ZOU7ttq+Evz3XFA52cslnijMONKdsdwnXhJ8pmoXH
Y6Szv7ANf2SZ/4UE/4wS2HGtN4FxFo/ws0kIcJLtYjQNuCzOnyv2GJpkH6DU
X-Gm-Gg: ASbGncvgWBWUkUDKFf+wu14EW0ibnBfniOmZf6aFb4SYswxPgBjy+o0o71Kebfr0by9
z3DACOSeEvMYiAyWNA9Svssa9BIVQnT2NnxLEjE1AkoOetAhI7+xKIviYjsDq3fMwaSNqB6poEx
zfai3w9rYOSXFgJbBnaGLBMmKdCZPCFey+pArbRQU28Me6ChyZTm0D6GIhJuXdHd/ObKEmaxZ0G
KZfz4eU8KdTIwfkHp7+r9QTwDShnWQr+pZwW5bs/Ze2Fn9gaHRvcO72x5ffjL8C8amUdSOXgYLg
lZ2fioFmjK6Pu8mcbuUnjvsv9pNfBTxJJgYmRWvSyKp4FUPAWteWl05+zdcYFZ/JPhVvdr031Ew
5Q/PU+E2MMJBn
X-Google-Smtp-Source: AGHT+IHyefBPEU0VlZBbxR4Oc9/5aOlQwHPgVBkkHdm6SPOXw34nGCONx8y9VYXaO4Ldn69Yld/sBg==
X-Received: by 2002:a05:6808:15a8:b0:3f6:77d3:2546 with SMTP id
5614622812f47-400465979b3mr1809970b6e.14.1743801306733;
Fri, 04 Apr 2025 14:15:06 -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
006d021491bc7-6040c4ea9e1sm788661eaf.17.2025.04.04.14.15.05
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Fri, 04 Apr 2025 14:15:06 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 4 Apr 2025 16:14:50 -0500
Message-Id: <20250404211451.91394-8-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250404211451.91394-1-romain.beauxis@gmail.com>
References: <20250404211451.91394-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v11 7/8] libavformat/oggparseopus.c: Parse
comments from secondary chained streams header packet.
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/20250404211451.91394-8-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.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".