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 0228149776
for <ffmpegdev@gitmailbox.com>; Mon, 24 Mar 2025 14:52:35 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAA6C687BCA;
Mon, 24 Mar 2025 16:51:41 +0200 (EET)
Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com
[209.85.167.180])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1936687BBD
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 16:51:33 +0200 (EET)
Received: by mail-oi1-f180.google.com with SMTP id
5614622812f47-3f6a92f234dso2528573b6e.3
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 07:51:33 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742827892; x=1743432692; 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=LtStfO4VZr+BhyF1EH++Ih+zEi1NV6BVoL2JJ2LqPKB9oRxzdK/B0neYFy40sqRy/W
bARDYFN6AoGO0G9RJEBlR6w8YZAduollmHMsTSoy1K1sX60QMuJz38GHrfc9Xcuqh4iK
EDKsgxkMuXk/qfl7xANXihx2n/kivVqgPwZ0RI5WzqjxGX81ePoiTOGPwcD5YEhUVo2e
SiKNoWntVc8aqVpA4A6dsvFUKd2jIFGpqzSuP7G5sTyvIh0EOVraSip7Qx8/T1uHX7kz
zecUqgxLsHgwqAw1tQueIOdkr5MBbh8stmFjZ1IwI/laUf8EeZPwDofaiqESIUXR7e1P
5KIQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742827892; x=1743432692;
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=Yon3uU5Qq5QFsVIJ9OVVjSUzqPiv6+e400fcH5N/17XOks3M3swj8dVPvxY4KCWqSu
hvr1QPOiaOzH13EwOh9CXv3yycZTaSjl98U7hFxT5vt7luMRzTcwoKBp3L9W0F48cpN9
dhXEY0daj2DcngB2SXumgj8gwx5dW6yVdotubgTjGxbl5R+wC9IoAOygRdqqP1uqituC
PU9sC+CMwaKxBylhL84RN3a7p96SUFSOE+A9WjIAUz6v3RnD6+NZ6nV5sajb8MB4qjqH
u/LpFvdA+Gu/xP6JLV+IxfdAGE48rNnbaf1Cj0VjRwkxWa5fvgPxhreFvp9KndIeM2Tw
1Ucg==
X-Gm-Message-State: AOJu0Yy00u4WFdnp6//XbmdNnjyYsiZTowMXd+JSwG6f7TO6rvJxCMBA
UEKKqwk7W0DPhkZm7Tc3YaCPVuoVOtAwdwbdNxx9Lf6D1DSTK5ET8xLFKcVA
X-Gm-Gg: ASbGncuPFmq/Z2HvdUX2PfjZXmQq/urbMaF3EuMlqd9mAiIeQxBxTmljiQy5LGx5YOY
ltBi9B9xBoMr+nWMtdOcI3xox3VTw8HGQVW/SuJDxHB64Ip9ron4Kqr0O/C35Fq8DE7VEWBmAGo
5ZOM4Zqr2yF/94eLumfnaYbB70t/pCBchnHBJ62jpcHaZSWxhoX9dXs9SwRVaxNorH/+6LmOpjj
v/zI6mLKEaz1i82oz/qyEY6hCijcxgjxQv+EFoUGgFmq0NkouJ3wrGCWlCw9btOqVPad0w/8ciD
Na4pMDIAmGEPSj2xqDucNSymjQLTYcxgpEi5/e4VWc1k9ek0CFnbJi09jUCpN5EzuRzHv8WecLv
9nYB7uGt8
X-Google-Smtp-Source: AGHT+IG8nn90el9fzQ5O4nFY+7oAUm1opt6tc1kgL47fq/EC4zxnB29XJKklsCDm2NEoBHRsLrGsJQ==
X-Received: by 2002:a05:6808:3a16:b0:3f9:36ec:dab3 with SMTP id
5614622812f47-3febf7226a0mr8158677b6e.14.1742827891692;
Mon, 24 Mar 2025 07:51:31 -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.28
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Mon, 24 Mar 2025 07:51:30 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 24 Mar 2025 09:50:55 -0500
Message-Id: <20250324145059.16593-5-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 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/20250324145059.16593-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".