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 89D5849824
for <ffmpegdev@gitmailbox.com>; Mon, 24 Mar 2025 14:52:59 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7151F687BDB;
Mon, 24 Mar 2025 16:51:46 +0200 (EET)
Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com
[209.85.167.173])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 540256879D6
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 16:51:45 +0200 (EET)
Received: by mail-oi1-f173.google.com with SMTP id
5614622812f47-3feaedb531dso841386b6e.3
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 07:51:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742827903; x=1743432703; 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=QSQtb2QKWfVMbFf8+2dsLZGLsrnnZfFQ9QzFuRBEjYqYSJqh7EI+eTtlV3EI09t//v
uWtpyBdWAi6Wp9tQBIISPgHOkvruq55pIodNe8sWOXls6aY6QdrD9RJSHgz0SVrmUFUS
aJ+zkj5YAK0ofEnIfHo/0yERHoPI3QfC0y4oKbGaUzYlrgVAoRALW1QJncLoAeE9Q7AI
Lkna3wFCuc2epNW3jFuOMgYe5H5FfSujHTPccKNilat2trkbGLg3FwJxp14oFkohZl/X
r2+tIHGalFj4ZxuyYH0C8MmbRvDb90bK7YPSMdYaRmbFIcR0cWfXpILvzgyGchnOkH4G
w9/Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742827903; x=1743432703;
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=pc8LV6Ay70uy8LUVBIJky1+UreL0z+5AMVA57NMgFtfsg7A/uzbGriPhVt0h8fT5Qn
CN6kkUpMxdZj6BtKJ5l+Y2QHhyjlU/s9dvmFZIh99f9ig1NZEzY+Wr/K66S2cbWHcD5e
4TtY+pGRKHenMv90N+4z5r1+FQZyNgoZxAi8QTm0unnOjs0S0rqP0zFaW/ulyFXoIkur
qQDBPr/YXbxhb344j2Wl4GTWq/QrStpWEdoYhZLw6xQz3I74j1nmwzRv5K2jWl4DM1jg
rJT+o+Ab3oLLWgZ+Oyd2+qRrfqf55nf+ntcg34SOwrxeDypPmajLWZSuxyxet+YqszyH
P2eg==
X-Gm-Message-State: AOJu0Yyc0RVkDPULhjOsuFI58m8WgwvhDWJZTehmGhv0poMbZPMFf4Rj
oRWkz6mOWILqxSDj44cwkF0t3Ow9ytlJcSc2NeFUU4AWrTx6ZnOrRX5rAQxh
X-Gm-Gg: ASbGnctGvwdYT9k1xjUAVXlbfMSJ61rQlO6XtjwYw/ME268I6zWVArlkMXTgrHgESyU
6k6P9eyLPEjqbZza4npPlSqYPs3Tov4SlSfR6YSfixpb3j2hFM2cdjQ8FymC7spwynwooyQ91p9
rC6M6pCPDz4wN47F/NQQIGcNnrx+pMTKN3Y6okV2G+aLvTIXBo3NxbYPkxorfH2V664rcSdJ3bx
5Wq1qVqGY979Bz+NQ992vCb5wlLYGkIit/9gMHKaXEtB33WEfVPhmJ0JMmNmdNA7H0VjpWukLou
aUe55aGEx2O8W0UJkO2tTs26KIk+R7QM0/+riSfBk3qbwzfjNDFdAcRULt/TIDF5rgoDYWPO6XR
9DpqRAdbO
X-Google-Smtp-Source: AGHT+IGRofKWGB5nipk3fblaW6h00qRAwKCZgsVipAGXfG8FVA8nni+OII4N9wupgo7ne2WHaWpBTQ==
X-Received: by 2002:a05:6808:f10:b0:3fa:adc7:1ec with SMTP id
5614622812f47-3febf738291mr7261651b6e.18.1742827903177;
Mon, 24 Mar 2025 07:51:43 -0700 (PDT)
Received: from localhost.localdomain ([2607:fb90:e335:ccc9:113:6fea:db60:5cff])
by smtp.gmail.com with ESMTPSA id
5614622812f47-3febf6e956fsm1612030b6e.16.2025.03.24.07.51.41
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Mon, 24 Mar 2025 07:51:42 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 24 Mar 2025 09:50:58 -0500
Message-Id: <20250324145059.16593-8-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250324145059.16593-1-romain.beauxis@gmail.com>
References: <20250324145059.16593-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v9 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/20250324145059.16593-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".