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 E304A4C265
for <ffmpegdev@gitmailbox.com>; Wed, 2 Apr 2025 18:30:51 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC89A68A467;
Wed, 2 Apr 2025 21:30:02 +0300 (EEST)
Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com
[209.85.210.49])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04BBA68A0C5
for <ffmpeg-devel@ffmpeg.org>; Wed, 2 Apr 2025 21:29:55 +0300 (EEST)
Received: by mail-ot1-f49.google.com with SMTP id
46e09a7af769-72b0626c785so115227a34.2
for <ffmpeg-devel@ffmpeg.org>; Wed, 02 Apr 2025 11:29:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743618593; x=1744223393; 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=b0gH4nL4cGGyvOjPQUIk04w5+ziqRnR4Os0818gimYg=;
b=VHaZ3yEkA/rDhgtUFG9djLet3NyGlOxWx4aW3S81bR7AQqMyHN37z/hazJTUIlZaJI
64irkIPoOKFkRcrPDwl+Mp+x4/VFMV/AIu0MxJRMmzrCS1z/wKqcR9d8skW2D+g7x2MR
NEu5YFficLZwZPlnZzTzFSn1M92Ax8J4XBH4we5PWXkZYm4AZ1u+F1tsKkq4AxOyRzDP
WMaWKjJXd/tVAAR3Pr30oEfx30H3t+SlzwIYsVK7bQB4Y80IkmcZ2eR/g7lTrn4MrdTA
3JGThoAKpjl0B7MptfdP2FGduVWRgYf3PHM2q0EAjWETgsRZAFv9GUAuce8xbPqmz/zY
vXZw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743618593; x=1744223393;
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=b0gH4nL4cGGyvOjPQUIk04w5+ziqRnR4Os0818gimYg=;
b=fip2c+gsP6NXBQjOEVyAzIQg8uT2B9WCiFrX3US+VhsNLVn3b1VNF8IGbMNmpv4R4e
iFEga1GGzKY+p4r6k+GsCEqpT5oG+hWsXC4jyfBekGvTOFjIlktWIPGz1u8jdvdTn0uV
FISPSUpc3L7/ZpBrMsuTtFHvX9Soq2nJX0cWXNkSxsuWjwKTc0rCrR3lOQbYJCXRIMhI
4cZRKxe62bODQ2L0Kgv1HYS1khBMzEOW8MVlIy4BkeYBNz+PpFd4aHX3MUvPNswn2Tgx
f8Y6REFbVjSr4c+CsKY1QjJ/Wm8egKaiPm4INPVMzc6TRgt3D1epGdWcfqbKKj4Hhz1k
2Pog==
X-Gm-Message-State: AOJu0YyOW0ZdRNJSVDj+LMkTU78HdsF/6Dq7uK3lq8p3oMnADoR40SIS
Fj/8RMijol4x6bgS6LLoCK9tEjaqIjJbZpMYLkR7PIPJsPYzloeTER3oZGPt
X-Gm-Gg: ASbGncvA9iMj6OdPwc40W9VsEqACHSiiPo2lhoNsyMsO1WfzJsdgDvghHvpaWtAodYE
zV6s5sODKDa6MQQZjlY3gPauUc/uB/Rq+2TgyWNHmYqLPpmybqCnDqgrKIhdwyPRbtDizScB/Mm
RmPnDSWSS4zOa7BHffYblnUJddFLs/yDmvL/tQdWdbRDN0SwQA2z/wngR9Eic+LZJjWjiR5GEsy
Swk7osnnQtVjE7Y5AUFt8oogUqi7Uo7cL6A4f1wQ58A75a7FruqTzcU1ayVzJ5TYXZt/nIQP2GZ
SYcig+Jtzx3NHecVcpcy6y/xgkjmrYPGs2/X6OIEUmZE/6z0HZ7J7ECr4Gv97+1nO+5EPHmM4bY
lYW/Nd/xm9h1Z
X-Google-Smtp-Source: AGHT+IE467WM0zVdnC1Y+uzc8zhO1U/TGx9Hj3HuBcLV8WOdYBi6TtQjXeXb0qEr3uUDwu1HhMZWzQ==
X-Received: by 2002:a05:6830:2808:b0:72b:9dc8:7f30 with SMTP id
46e09a7af769-72c6382d179mr11882625a34.20.1743618593270;
Wed, 02 Apr 2025 11:29:53 -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
46e09a7af769-72c58267f54sm2349862a34.55.2025.04.02.11.29.52
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 02 Apr 2025 11:29:53 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 2 Apr 2025 13:29:36 -0500
Message-Id: <20250402182940.29726-5-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250402182940.29726-1-romain.beauxis@gmail.com>
References: <20250402182940.29726-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v10 4/8] libavformat/oggdec.h,
libavformat/oggparsevorbis.c: Factor out vorbis metadata update
mechanism.
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/20250402182940.29726-5-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavformat/oggdec.h | 14 ++++++++++++++
libavformat/oggparsevorbis.c | 25 +++++++++++++++++--------
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 43df23f4cb..c8460a66e9 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -151,6 +151,20 @@ int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m,
int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st,
const uint8_t *buf, int size);
+/**
+ * Parse Vorbis comments, add metadata to an AVStream
+ *
+ * This function also attaches the metadata to the next decoded
+ * packet as AV_PKT_DATA_METADATA_UPDATE
+ *
+ * @note The buffer will be temporarily modifed by this function,
+ * so it needs to be writable. Furthermore it must be padded
+ * by a single byte (not counted in size).
+ * All changes will have been reverted upon return.
+ */
+int ff_vorbis_update_metadata(AVFormatContext *s, AVStream *st,
+ const uint8_t *buf, int size);
+
static inline int
ogg_find_stream (struct ogg * ogg, int serial)
{
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 9f50ab9ffc..308deb7feb 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -263,20 +263,16 @@ static void vorbis_cleanup(AVFormatContext *s, int idx)
}
}
-static int vorbis_update_metadata(AVFormatContext *s, int idx)
+int ff_vorbis_update_metadata(AVFormatContext *s, AVStream *st,
+ const uint8_t *buf, int size)
{
struct ogg *ogg = s->priv_data;
- struct ogg_stream *os = ogg->streams + idx;
- AVStream *st = s->streams[idx];
+ struct ogg_stream *os = ogg->streams + st->index;
int ret;
- if (os->psize <= 8)
- return 0;
-
/* New metadata packet; release old data. */
av_dict_free(&st->metadata);
- ret = ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 7,
- os->psize - 8);
+ ret = ff_vorbis_stream_comment(s, st, buf, size);
if (ret < 0)
return ret;
@@ -293,6 +289,19 @@ static int vorbis_update_metadata(AVFormatContext *s, int idx)
return ret;
}
+static int vorbis_update_metadata(AVFormatContext *s, int idx)
+{
+ struct ogg *ogg = s->priv_data;
+ struct ogg_stream *os = ogg->streams + idx;
+ AVStream *st = s->streams[idx];
+
+ if (os->psize <= 8)
+ return 0;
+
+ return ff_vorbis_update_metadata(s, st, os->buf + os->pstart + 7,
+ os->psize - 8);
+}
+
static int vorbis_header(AVFormatContext *s, int idx)
{
struct ogg *ogg = s->priv_data;
--
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".