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 C47A94C26B
for <ffmpegdev@gitmailbox.com>; Wed, 2 Apr 2025 18:31:04 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 259D968A5B8;
Wed, 2 Apr 2025 21:30:04 +0300 (EEST)
Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com
[209.85.161.45])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B87F868A2F6
for <ffmpeg-devel@ffmpeg.org>; Wed, 2 Apr 2025 21:29:56 +0300 (EEST)
Received: by mail-oo1-f45.google.com with SMTP id
006d021491bc7-601c46a92d1so50507eaf.1
for <ffmpeg-devel@ffmpeg.org>; Wed, 02 Apr 2025 11:29:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743618595; x=1744223395; 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=q5OeNROkFB85pZRionDphPl2ghM2Fdrqxtf6GPAYeYY=;
b=nIQlQCLkUV44on0yP1XC1jqnzbLUpe7cq/uD8N5zGmemiOkSxcv3WyTxr60NQTExsB
Up2yAjqsdl+i4WhV/muyt2clvFfmHLCBJdBv+2vw68+/6/c6A8aC+jBRPry9gKgQ3WWG
rirK8cMoSgtV0+Hlejt6/m9HB7s/439QMvN44gfXK+7v87W/he3bDAz0lGcGrQEDP/OR
pBzG58ubxf9SaG0l7zcYKrd/vB3V5+w0YcT6q7RbhB/B6+zOq3AzRkLJU9Y7UJBEjz0e
L3c+ouKhcEzgHuUBYZZTMv5rw3z5vuTQObXKAPVyqw9mxtg9LCwA4dRv6Co5WTp3mIUW
alnw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743618595; x=1744223395;
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=q5OeNROkFB85pZRionDphPl2ghM2Fdrqxtf6GPAYeYY=;
b=d0kDM0hehCWHDyAGtRpQWS8vtftTmpilS6s3JZX2XU0xveagPvJTdF67Y9Mzkj19bo
gZRQdqQryFB+k1FzLe4zcIvlsJgB0/NRjDET+wiKtIeJbvQ4Y8ek/+vqtbsMz0fU8F49
ADXvZszz2XbgWt7X+GhvShoJmccG+c24xdgUedCc9C2wZg0L/4o8DfTVg1gxVjGPVsZ3
fS7JH3hjk9Ng3NUdcYS4t5QENJDRZCI7Imj1q31ChaEmdLqSGQF3U+rqFQDUbIlh0jiV
4AK0tUzNEm2kDVC6YCFuM9nf+sfvyElLVQzc91l8UldTAXPTt7qSiRQ7Wy4BpNePbyJb
Z+PQ==
X-Gm-Message-State: AOJu0YzSh9Et5INBpKVea7xstzkrjkPLqEPgMs/7OmEw8Vn4oqxIBtLE
hfAl7sI8Cu5gjVcP4x1qTwcb7HTvLqTRWu0dWnw7DUhR+ZzajuXedbUXXY6m
X-Gm-Gg: ASbGncsMdjfwKT2hqMTA1qG0UljuTq+tSTS88k4+74fg/Ay7OPi4ZOncczJsb+812Ec
Inl3i+LbjgcvEkkSt6I45S7jxlUGdhrgL9zRxAxe0g4B4yhQL4DNMbQw07wON/T9uNprjpa8S2a
NuZ2Uh7pJr7spsOg7qcHp1FFUt1Jih2Jg8WucsXCkXcod3UMDQfHyrHg5hEaga7q/geeCy8oLGO
Q4BSSp5cCuqsIKVU19xFXhTmwV6afLsNVkrYo6dhwEcNfMlLxejvQiRo4rgPSiZO024Y57lN8pY
k5yc/W/MNnTvhV1xMPrEsCQETzTY8ZElM15LA5ysE4UiJn91mnDE9OynpKgw9e0mJKt1nQso8Lp
jzSoQyX1LVUFH
X-Google-Smtp-Source: AGHT+IHk1HT0aVm2m3isN8I+99I5i/8IXXw1JZ2tLEsyBFJY285A6Q7QZL2ZW13AXuxazfSB+3P2Pg==
X-Received: by 2002:a05:6871:4081:b0:29e:354e:5fdb with SMTP id
586e51a60fabf-2cbcf74ed19mr10425088fac.37.1743618594746;
Wed, 02 Apr 2025 11:29:54 -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.54
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 02 Apr 2025 11:29:54 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 2 Apr 2025 13:29:37 -0500
Message-Id: <20250402182940.29726-6-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 5/8] libavformat/oggparseflac.c: Parse
ogg/flac comments in new ogg packets, add them to ogg stream new_metadata.
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-6-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavformat/oggparseflac.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index f25ed9cc15..29f5904575 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -78,6 +78,25 @@ flac_header (AVFormatContext * s, int idx)
return 1;
}
+static int
+flac_packet (AVFormatContext * s, int idx)
+{
+ struct ogg *ogg = s->priv_data;
+ struct ogg_stream *os = ogg->streams + idx;
+ AVStream *st = s->streams[idx];
+ int ret;
+
+ if (os->psize > 0 && os->buf[os->pstart] &&
+ (os->buf[os->pstart] & 0x7F) == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
+ ret = ff_vorbis_update_metadata(s, st, os->buf + os->pstart + 4,
+ os->psize - 4);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
static int
old_flac_header (AVFormatContext * s, int idx)
{
@@ -130,6 +149,7 @@ const struct ogg_codec ff_flac_codec = {
.magic = "\177FLAC",
.magicsize = 5,
.header = flac_header,
+ .packet = flac_packet,
.nb_header = 2,
};
@@ -137,5 +157,6 @@ const struct ogg_codec ff_old_flac_codec = {
.magic = "fLaC",
.magicsize = 4,
.header = old_flac_header,
+ .packet = flac_packet,
.nb_header = 0,
};
--
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".