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 9EFC44CDD0
for <ffmpegdev@gitmailbox.com>; Tue, 25 Feb 2025 22:03:10 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 938FA68CCAA;
Wed, 26 Feb 2025 00:02:03 +0200 (EET)
Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com
[209.85.219.173])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E52068CC57
for <ffmpeg-devel@ffmpeg.org>; Wed, 26 Feb 2025 00:02:01 +0200 (EET)
Received: by mail-yb1-f173.google.com with SMTP id
3f1490d57ef6-e545c1e8a15so7068996276.1
for <ffmpeg-devel@ffmpeg.org>; Tue, 25 Feb 2025 14:02:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740520919; x=1741125719; 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=LiZ+XXsP+4gFXq+AkDRzqZJvErNdt/2SO+UkDg9GThfKOZqoBub/qWyyZguMfDvDSo
TGEiH/MOw9DBAA4ju1I797xzMMIH7ds7ZHu96nHn5BdVo6XuX/FNdXz1PRoILPlZS3Fi
vbIYWyx/leg8pof8IIWOC7G3iNcODH20Aaf58/cLjlpMAne2XbNJ9drCFdTZ6oI0AIqu
xpwpY0J/neAuGg1uoHlHKIi2+e9Lkun1kqmjKX+iTcvalWBrUE48ND8wlzdBK4VSi9WR
eM8OzOg6Xmx+dJpEwA+Pi1cvaKNyzHphVLvYlsguIOuS/8WzRx3dYqJIiXhYV2Dw/NO2
ZvHQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740520919; x=1741125719;
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=uZb4OZuqdiHsdh7UkL0N29aON23H+T/QPkhNd+Yks5QVWi1YV3JnXhlRI5/dqRLWzK
Xy6kFPD2m8XSvwqFUUuYV3cLfhIUwYSQ4Bc1dG9FXj+9fPRgtwDmGvp5C+XaYqX4Wsr8
bpxrL6QBvrX80E4Zur+Co4AeBskU9DkqE98MpcwYWwjs5k3ExYQuAM6RbJD43zSiujk3
j9E8P7/Sv0pv+XMSrM9bRmjjHZuzaVIQik4t5vKyyaLoQk4Rh7KuaCEZPwRbDmF0lFD/
8ebE9b1JEi0U5K8xwSfmYglySQRc5QacHE8U0M7+TYrFoWKuhRAaawogjOyTNdXmBrLi
tpwQ==
X-Gm-Message-State: AOJu0Yy8wx3i/hYrLHiMuAzyJBb/RDC32kVsVBhntCf0NqW/eOC6aP3O
7vQ0r7UwsME/9E5XIB3e6ZtC9EC16CXE2dYIoT8wUwGZ6Bk6GdqGjhbrZmjn
X-Gm-Gg: ASbGncu1p6HouLfuOjkcqC+l5Zb1/4mhMH8d3tO/5isHSYjK+bvjswFbguD6WsO2bDQ
kr7F+j93twoAk/9FwS+BU/iChbK6CgJhPT7wkLA9517GI7ADqhZas6dsLd6191VGvY8dX7OPWSO
DQKEQGJTzmEqS9QQsIlhLkgOjapz5iXeCzLQ13f3s2LZjznhEQwO/HmN8cQz++kcqtRrIPS3gE8
SfMRzHAghLA0SSH2JQO7Z0F6HJMYkzSm5GvuyBvMdJ/0IwM6ZBFgHsrTUQHppO0sjIIVb+x0E8F
lEnqHBAYJ8/u+GajZOG9NF3BJYeUvvOjqkWnsfR6gyyQYn1xkaHLWuyAstGnfmAUed0=
X-Google-Smtp-Source: AGHT+IHX6D9Z5w3cLYnoLMt44eutIBUlYg9HgN3eiigse04TQFrSWW/sDh1UlejtiFEmxaEroVmusg==
X-Received: by 2002:a05:690c:4981:b0:6f9:4a4d:1fa1 with SMTP id
00721157ae682-6fd109e682bmr39415607b3.9.1740520919404;
Tue, 25 Feb 2025 14:01:59 -0800 (PST)
Received: from localhost.localdomain
([2607:fb90:e333:5b39:2036:1eaa:d627:4a51])
by smtp.gmail.com with ESMTPSA id
00721157ae682-6fd117dd70csm6487767b3.83.2025.02.25.14.01.57
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Tue, 25 Feb 2025 14:01:58 -0800 (PST)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 25 Feb 2025 16:01:20 -0600
Message-Id: <20250225220121.98449-8-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250225220121.98449-1-romain.beauxis@gmail.com>
References: <20250225220121.98449-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v7 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/20250225220121.98449-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".