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 F187849971
for <ffmpegdev@gitmailbox.com>; Mon, 24 Mar 2025 14:52:22 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E2B0687BB0;
Mon, 24 Mar 2025 16:51:40 +0200 (EET)
Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com
[209.85.161.53])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BABE6687BB0
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 16:51:38 +0200 (EET)
Received: by mail-oo1-f53.google.com with SMTP id
006d021491bc7-602513d2201so582102eaf.0
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 07:51:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742827896; x=1743432696; 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=DyEvyqkDuyVwn0grf9J9lKSJ9hnUGKrDjTFfyJ/vsRViqZE8aVlmWGXetM9a1u3fPS
D5/Bzom1dZV9VVaVVPx/rEdB04cT2xDJC0N2tiTh1VHLHdmRLp2rfjonNM45ba57X2Vh
E6MKiRn+UThxF5atyW0NZupduN9PIEsqMsIOMC+qPV26iVAcDnZPu5H2uEUFpLTjKyhh
abxHBVhgo3PlV6EMUTT/0Umn+6Ne95GF/AdpM5eZGVWrFGC/VU0WlVMoSQ1/YZ3g30au
1Ya8C4u3UrJ+D655qgbu2XpzjkGMCE8Xz8qZsYp3rb4Ak6Jfyej2rAuX07QsB1LpevDV
C6+Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742827896; x=1743432696;
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=dKz5ISDFm+5aYEfkcf3I7Hps7DdKbcQV0971L1EZ4EZm0Yw5g2MX8oJyUVp49654vI
c97oFaarjCEgsIVcMKAhnB+LFiE663zcV3UAOJwQ/9FL1wAHK8ydUGfTfatKuQBf9uSX
mh4TH0DcTnp40e4j7Mv0yAqTWJDlMbl6RHuxcWYl3P0+9T5a7xoFw/kev79Eaj90diVE
Afh4K4ti8JATzy+KmfqOqk+4sg49QPfEBP6EVRaoYoTpB/pdQyN8QGXnXX8+tSP4Mrzn
SkNrp6XHc03ASX+Uh1gTdi3j9WMlgK4zDmtCSsC/4jK0rk5hCcmxsqEOFOH7yBpnKitF
G3cA==
X-Gm-Message-State: AOJu0YyrwEmVek/gZZkNRCwKsRVkbFgVQ77FhW1V4KL5C55toFXvpRce
JkUp9wThZO42AvVLvcyjgMds3Y/22nDLiWD79++f1k5AkBXs9pgJQGchN0xI
X-Gm-Gg: ASbGncterQe6w8dGzvDWLYYZtN7u05sXAjb4krYCZ5qzUxt/GDtvu/qQ2Q0dJI9gBT0
Fy7foJoHEPlXMPjyfBHdkKcRakp+Nzwc0pOcPvvV3YLB2iKY6zseCAmOEsQaNAW9qkcJJPRSwaU
jHcoAcBOSHdCZKS1CBdgp7Pg1NeTaGc5fb51h8NLOz8/p72lgOMV+PD1EaqaC8mzoukZLXMBOGi
4dn2L1wx9sTebNHEULhDfggXqjuMZwfOqY0O1GW11z0zNkPSmx4E1PdxyWRr1fmpF3iP2ZIWVkv
2jINCFjdUYzGD7IENXNgOLt563Vd4hz6Fv88kdVPxRnnIQgtDufuWgqUigDVSmM6Jty4uUEPBG1
74OlCgxkA
X-Google-Smtp-Source: AGHT+IFEnTZfGpnLMb4+KZdWbq6Kh/uxtPm+vFnM67B6dDLVCeecsQmzpN+p/OHnlgwydZb/EjeOFQ==
X-Received: by 2002:a05:6808:6f89:b0:3f6:7fd0:808c with SMTP id
5614622812f47-3febf722ddemr8725324b6e.16.1742827896256;
Mon, 24 Mar 2025 07:51:36 -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.32
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Mon, 24 Mar 2025 07:51:34 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 24 Mar 2025 09:50:56 -0500
Message-Id: <20250324145059.16593-6-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 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/20250324145059.16593-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".