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 2CFB44E47C
	for <ffmpegdev@gitmailbox.com>; Tue, 11 Mar 2025 16:57:19 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6CCB68E1AF;
	Tue, 11 Mar 2025 18:56:52 +0200 (EET)
Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com
 [209.85.128.171])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E835A68E1A3
 for <ffmpeg-devel@ffmpeg.org>; Tue, 11 Mar 2025 18:55:36 +0200 (EET)
Received: by mail-yw1-f171.google.com with SMTP id
 00721157ae682-6ff0c9d1761so10012777b3.1
 for <ffmpeg-devel@ffmpeg.org>; Tue, 11 Mar 2025 09:55:36 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1741712135; x=1742316935; 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=H83ME2/TBaROIdYnrs32xzE0qKC98j8FPJW8l6KINkxedvmTwBO4evtaQsWP/pXzaR
 2ciQknWMjUoRqBbWISeW8yu/NLtSQJAwAUTv+SzVB2rFlNEKfW78qkt/oaL0tULTIgZb
 N5093Y2Ydww7hnlBmb34zVNuXBwmuYtMJP3B3NSXJu7hz/F2mBx2woi80YoOBARfU6D6
 eL5JLYSmzGAlLflk1j3iDLjJoLxEqThBuQa6I3UgRGDn+JIsU6Y3CCsULLLuB4Lmf7dE
 EIlgGkwIQyjsBalZJs8gWOWvkncBJxoStvK86HaaYenY+Uev7Bsu6eFLz713WfsWYWWf
 TIiw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1741712135; x=1742316935;
 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=tefzw2Do6HO0XbKNiNSze4IdNKmaDRBEVG/eOfYCKfoVWlmk1qWNSrqdNAoOdmXAtj
 TWOUVmIrXy+v2dl6Xp7STuqrnepk3mw/0nFO8/pbNjhhrGeCOPe2qPgzPStmx9CYCn0P
 YDDcuiAva+pTYUgzqhz2tWU2Xo1EPtat98s/aGUb9TCtJpvV4vB/NNsupE2/B2KiOZXw
 /HGlHhRwLGSehWeRgihCcKsDAn7T5wlHL83i0A+Pz0GqNiGHEkbnlVwR/VrSs/SbWP4h
 mCQoS6osVVVUbIOgC0a+WIwq8xn7qpwCLBzDnGbC0XmsE2WW4ABusRxAqy8xgZ0l0sLD
 /8Ww==
X-Gm-Message-State: AOJu0YwjHzGgjBaYhkL6Ot/F93Mn89v4JnQb/4A5gxDy7gkLabpMq7Qi
 ug2kgTx0MmIZ634/6ianDL+zbVrJ6nCgzjll4YErktOI+EFoZ1QFViOfN3D5
X-Gm-Gg: ASbGncvsn4QB5Zsd2ZhbGnp63bw8PDBa+BySAjFYxn6jkhPzltA8Bx9c/9TOYr107M4
 YxqlNj66LxL9klXy3SOQJdwz36XDOYuneNXfTaWU7751Tac7zraQj178ddN99I8urcqw0dVt5bK
 +IOOsq8Vidi6iGDT0HCflJKHkqvZbqZDRV8bpFuKOkQNJHy9xOPSBgTC8X2Fe0vaLgOVvTdhDys
 p8P6VwCmuPEMJkjuRTnPwezGZSCUMjCmGT2tgoJ4VdodKc2Cfk+m/7m5B7sTbtnG93tJ09A6ANh
 pQXD5Mfa/j86b4JCAhqTxC8h4U97dyEOIIHafVHj/+lvvlTVyRK3I240GJz/80DLQIU7m1S3YYs
 DgK7Os6Se
X-Google-Smtp-Source: AGHT+IFVjJGeCfd/R9yvdrXVV3BFL+89gNFkNqRRXYbxxfqSSSTgYwuORgAxnb/jPoV2TXnuxkdZZA==
X-Received: by 2002:a05:690c:6209:b0:6f9:447d:d1a2 with SMTP id
 00721157ae682-6febf3aea30mr250831937b3.29.1741712134790; 
 Tue, 11 Mar 2025 09:55:34 -0700 (PDT)
Received: from localhost.localdomain ([2607:fb90:ee62:1559:4ce8:9cd:68c0:bf98])
 by smtp.gmail.com with ESMTPSA id
 00721157ae682-6feb2c64b57sm27544217b3.119.2025.03.11.09.55.33
 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
 Tue, 11 Mar 2025 09:55:34 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 11 Mar 2025 11:55:12 -0500
Message-Id: <20250311165513.17834-8-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250311165513.17834-1-romain.beauxis@gmail.com>
References: <20250311165513.17834-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v8 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/20250311165513.17834-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".