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 2C6374CFE0
for <ffmpegdev@gitmailbox.com>; Tue, 15 Apr 2025 22:23:56 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C8E2687D91;
Wed, 16 Apr 2025 01:22:57 +0300 (EEST)
Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com
[209.85.210.47])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9011B687D71
for <ffmpeg-devel@ffmpeg.org>; Wed, 16 Apr 2025 01:22:47 +0300 (EEST)
Received: by mail-ot1-f47.google.com with SMTP id
46e09a7af769-72c0987bc4fso1999784a34.0
for <ffmpeg-devel@ffmpeg.org>; Tue, 15 Apr 2025 15:22:47 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1744755766; x=1745360566; 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=AXHcpBDegToFbj8t6mfvZiy1v71gGYvYAfB84XYTd74iU0Msb5RJVfEYohtQti3o8i
qXZ4BzCv0T/a3l0gWDdLvR6wKAJOjTF1slh4qPeHW33CTvKGvrvaOZlmAPcbhsUmwqGw
+XpPzU9LyqdvInc24y9WhQYr8kFuwdJ0Ay1cTLxyqmTFoWKUK/CHdWV6zQRDDT1S6Lt8
FdHzbK7tIg2mN5u7PgOTtESJzE/w50voMw1kstoXTo5M3lE6D/wmT+pgYSLdE2Ad9oCu
b7Ocn0UOpi1kSTZxWNzeTa01e+szWKkeJVkN8zvQy0Iry3C6/aqi2UU73JeDL0FPVWY1
fqMg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744755766; x=1745360566;
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=m3Y6p2F+c3Mw6Si9eHfm+PpD4g8oGWtTT/CyVk761BGGNR3GtFpZ1AofzvO+839boW
AfU7hQAC3WQqedWldo80ntzE8g2F6MKqiz1stEUE7qJmzmvSy5EOaEwE5Jm8go44Ed6S
JG/qCAeSfykHZlunL3nCkkrAFd24Dsvvs8+dsG/pq6Wvz5KMwTLNyW7/w0dbRIwN6P+e
ZmphoXksPv6+ECzlnburkH0tK8pHn5wQccxs2OuFKw5YmmLV7bLJBaDxXA4s/ET1m163
cs7/JZjZzb3gC4so/OSf4MUmEQ7HLV1LP3ccedcuFbbTVlzZTZktdAOtac8ZZ2dz3HHM
Pj9w==
X-Gm-Message-State: AOJu0Yx4AiAA3K0RG15+Kjn91+DUc9G5HcP2Ansv5C9LOZ6BZQfqHDrQ
ZqKsXfpV5JC7/ZJ4lOZO5xkP0LFH8ofQlsZ9MpaR5vahsnFsMw705nDCrsjd
X-Gm-Gg: ASbGncsefeU1b6eEYtWD6azXbJdlP23GxtrAgNHnYGLntuaS1lCvZYap/d9nwDIYO0n
AcVaQXstxN8NV2t9/SJA1ic85VONoZnh+khvfep4UmM5lOgy1Dry7IaKu/xcAOB2ndaAd8SEDJ3
ohcM7LVRng1fnEjzE4+jra66hTU8td6kCwdPkY3Njlyj+vu+yZvmWb0vOFrt2qB17s/y548cri9
J2NW6NVIIEO+addT12C9RThj7ufpi0cn7bf+IyWATJnFS0/NVW5MBOuzqWNMsi0DzvroM0tpUDD
kCFHmuPIe3tMcXD2CVEo2aJGkjkryoRpbYx0vrbyxik9C7vyEDHQqUn4NfxhBrxuuNjnYwwL2Yh
+4yiy3eGz
X-Google-Smtp-Source: AGHT+IHrCLEhBKsgfoY0CV/Zc1n92HpZm3FP/mcTx6sgyYMTiWI0Ip9QVpoaRzO7QtAoHrUM05YvnQ==
X-Received: by 2002:a05:6830:6708:b0:72b:9180:cc6c with SMTP id
46e09a7af769-72ec1aefceemr694966a34.7.1744755765909;
Tue, 15 Apr 2025 15:22:45 -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-72e73e4d7edsm2576615a34.47.2025.04.15.15.22.45
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Tue, 15 Apr 2025 15:22:45 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 15 Apr 2025 17:22:33 -0500
Message-Id: <20250415222236.78392-6-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250415222236.78392-1-romain.beauxis@gmail.com>
References: <20250415222236.78392-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v12 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/20250415222236.78392-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".