From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7CB8A4D26C for ; Wed, 19 Feb 2025 05:26:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0433368C18E; Wed, 19 Feb 2025 07:25:22 +0200 (EET) Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17D1D68C154 for ; Wed, 19 Feb 2025 07:25:15 +0200 (EET) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-6f678a27787so53791097b3.1 for ; Tue, 18 Feb 2025 21:25:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739942713; x=1740547513; 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=hfMvOQww8bCviHXCnZVA+K7pru12Hz+dnbbCg3KSIlfDLhD/+s/OBo2/vikYV7JPUV 8t2M2h3YxFYj9AXiXuynFVLJoiKBy+i0ATElSh6GMeyvBW1qYzrtZRQSkSPjG1BeCkDI dNQwfhHRBPKM8GLhgofFHTVEdBGYOELkOXMGQc2d6W9GQt7FSnIAx7+JN6OKkkFnxj2v 3xWwQrV6gTRNTEuqKKIz4DA8QMqPNdFvvnCgqvreBnFi0Oijb+Bjf/ROrlLARg+33tL7 0DBf3rpiP8Cs3YFgGR6O2KpGENHlzglNkERdxuRiaXvinZwuUrbGTmvL/N8jsoPmRion Zz4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739942713; x=1740547513; 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=XYfrQH6GINNukrHq0T/Bvs1/nRoBCraXFe5bFxUIoTbbnql6/MD+sC6NRUVquaXF31 wHzY2xAFEOtR1q5XEkyLSdtUjt5S/ufPDCzQ/mPVY7BoLg6STqpisdVDlr86TxH3TZ7/ c0MTfDtsZJWbnQ5MDSkRfRTdL8t366Op3JJoCSyS1Xe6GfL3n+WFitatIMwiq5CHKBcM 6GGqziVpTivYhhqiR4Yx1gm+eF9HlMEhl1xGDNC/oIQPfDaYm5zIExomI3gGuzuo3re+ T4A8BulM46Mxmy1AQf7OaRKvbZnTVDVPGvkWF0kqVsZ3VcqUK73Y2E5+XgvIsNBy4JO+ +h8w== X-Gm-Message-State: AOJu0YzNMWRQsNEHmvmLnXN6j9iBkQAKbOVwp7E0E6Mq6KYew2hI83pP XMApPDyQPPBXkKqy3fIDxgSD1pZVZEn62Wy9gkA9DOMAzjpgtRZ3LBTOXw== X-Gm-Gg: ASbGncsV+qNzDmIwHnchMIVtGMXZysC7AMi83P4MxpgrA8OBgw13suKEdmGtXyxGVwT FHmnxMhePf3RlwaAIsfWVS4ndV81KKvEAJJ1ScyboW8TXLtZwHq7kXldI63qLiJ5Mhc/mNOx4oN BXH01pcsGvH4rY6bC/BV707aoZ0xfUytpQ0BMnxxft/yhdhu6ScZok5qgkXM2QuiL1p3x1cEKHc 9PsmeUWsB93vP9SkMAwIQq0C2xfgGEf/LZjiKmZsfMeqtEoFw/5/RFv4Rk8rLLiU0uaed808838 foynI1RDUx8rrt12jK3HgwPURQCevLLmMZjw0sBEl8OuVoSUmGDj X-Google-Smtp-Source: AGHT+IE7h7U4moN13FgFzEikG5FL/PtrD9hwUtMn2D1BfkeCmnkn5rUe9YScMB9/07W27OURc7QNeQ== X-Received: by 2002:a05:690c:9c09:b0:6ef:4cb2:8b4c with SMTP id 00721157ae682-6fba579e7b8mr24865327b3.23.1739942713124; Tue, 18 Feb 2025 21:25:13 -0800 (PST) Received: from localhost.localdomain ([2607:fb91:fe2:71a6:2854:c007:54e:fca]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6fb5a15f082sm20783537b3.54.2025.02.18.21.25.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 21:25:12 -0800 (PST) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Feb 2025 23:24:42 -0600 Message-Id: <20250219052445.86383-7-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250219052445.86383-1-romain.beauxis@gmail.com> References: <20250219052445.86383-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 6/9] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Romain Beauxis Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- 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".