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 BAA084C4D9 for <ffmpegdev@gitmailbox.com>; Fri, 4 Apr 2025 21:16:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9964068B8E6; Sat, 5 Apr 2025 00:15:11 +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 32E1C68B8C9 for <ffmpeg-devel@ffmpeg.org>; Sat, 5 Apr 2025 00:15:05 +0300 (EEST) Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-72c0987bc4fso968097a34.0 for <ffmpeg-devel@ffmpeg.org>; Fri, 04 Apr 2025 14:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743801303; x=1744406103; 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=meHKhPChTXkEZw8TlnA4NfwCOE/6PdOSUk0ghvytHZct1G0VJaFHwHylUurSX4iOec BJDLuD+uI/NZ7/j/qOuPavc/yoQ1EYQyZDaMc7puEnAyAjDBxzhLlN88cxIP0piU+hx7 ImuIQYgYzo010m1mmr4YxWXY4UkRDiDmpKqiEOsH+5eEZ6yJwB5X8oFr0ouCgt91yAK5 0l/jarNh+LmSBmNONikwK9cTK9uBr+IPpDI7Jhr2NVFpVWmWj2ggyrADU55WFKKTRBUW bjDJioe1JDyLVH12PUE0Msxo3u68iZOP0XR7A9w4mNni59GZuxTyYGl4SDX+Fq3cQUxF ilhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743801303; x=1744406103; 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=JnKNUdBNem8YXP76fYEcdnsUDESjr9PYaZeElJ4iNvO4DGVIBUactm9w8nIdgksX64 1uaYKcgFeZYphM+YH099dblWJCYkZVhuZcb6qQyYfd2feoHGHG/F7948tXIkGh+5WcdY +/q0DIilj0f2M9Xkiz9mdVDEQh7+MOgPOwCLKGD5RyJCEmVXSvkL4MGGN1Xc3nL3/Umz b159KgzFVlf3IN8Lb6PVM6NQT192fBRA3YGB9kvGf0YXQKaWsqx4Nt7lcKBLCXCTO43m DDciJiCRVqbDQwSxPwMIY9FMZ5Dz575D+YwL6Nw6/R+IJ/tnI61lvmLeuEaLJWE+FZJ5 6oqw== X-Gm-Message-State: AOJu0YwG0Tlpn3U+C8OPES4quiI77cYcdGqoh1B3Rxruyh8Beex1SMo2 UJLxmNgKORiYNgWAtH7mu5rQpqJvrLoadJ0BBVLxe5twSkeBWUnN6jztyWKf X-Gm-Gg: ASbGncsm3HOn5Ekx1A5NVPD7/kiYRBEePMhtQK7x7bj7hH/WZc9PazrAGlO2CXwnuqx ZVzYnW5eeJz8/hR8L51Kr4UJJEni1b/+zAe5OsPBAi9hIeGQPzA1XrVfjNSu9hvQczqW5jBI71d VBm9/6NlGWI8wbeD5uiVudOBS6mB6qLgELAyxvIsC6KNqHecBIj2dQOoA9P81WIwruYSoqJ1va3 8Xbcd0Vlz3TeIl7S/XggmTYIOEBf30nQGIpdtwwRAspx0nUfGfSDYd818C8pFPO+nFstc3531DO ZV471N9vWx5R6DpXMb2nMtQz5L+UnYb5sdCEdDVlZY0yjwo6WKu85/K7P6PFI5jJwq57/dRsPmL h6z+OBQRu4y+R X-Google-Smtp-Source: AGHT+IGNrYcSOIFq6R8o/FxCiTcLj40OpRq/8cME1aV+U1Ir3RxltvuWiH6eVkqXGY60y9HNlc+efQ== X-Received: by 2002:a05:6830:3907:b0:72b:a06b:dd71 with SMTP id 46e09a7af769-72e37f3c3demr2943565a34.5.1743801303300; Fri, 04 Apr 2025 14:15:03 -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 006d021491bc7-6040c4ea9e1sm788661eaf.17.2025.04.04.14.15.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Apr 2025 14:15:03 -0700 (PDT) From: Romain Beauxis <romain.beauxis@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Apr 2025 16:14:48 -0500 Message-Id: <20250404211451.91394-6-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250404211451.91394-1-romain.beauxis@gmail.com> References: <20250404211451.91394-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 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/20250404211451.91394-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".