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 A6EF14E46E for ; Tue, 11 Mar 2025 16:56:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3AA2A68E19E; Tue, 11 Mar 2025 18:56:21 +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 3608068E1A3 for ; Tue, 11 Mar 2025 18:55:33 +0200 (EET) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-6febf391132so44007317b3.1 for ; Tue, 11 Mar 2025 09:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741712131; x=1742316931; 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=j+fbW7cw452LgqFD4jwuzI1zZfFVs39Scsk4/Wbal4S8Hq/jMcGVZCA50PK+9J4IFw /gjSo/g898XFMUnNmq7ZG3dDD54/iy7CtkZErVjYvFGSVkvQt1xlSGIL1JyQXIbXOt7d aG6A3d52Vjul8EU4M3g9dBsyHq7fIsnEepJIgjIkMQrvj/kKcpzV8H2xWDptMIeO7kpG 1vXp+RQm2Hcg6gvHChjWhlKwelqlHwju83kqgdhm4pyQuQrR43d85eKjO2VYCqPkUtnL OaAk+6sG+29KQ+w5/3Nwn0/KDgEFx02S9PQeYEupCcM+ARRuke2SNbsAoEQ9xm2zgj3i lIdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741712131; x=1742316931; 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=NlU5wY2oNY0JfCrsRHB7R1FH4CC0rbtYTV0O8um+ZrBvTwyzvywyVHPBE4+2ACHy2P y/5ST6m7tlIio/nm5xmBpU8cZFmb39FLnl3b7yyfyglsAMsBrhgabt1j5gICyowEUDpR B0XtdxIjSJGxkw5IlwQFehBEZeX/xvIGGYqR/bxuOn81uv4sxEYwrOWbuVnitFd5EASe gZqpemypYB0d7P1dWPNjGN+9rr6gAcWMAfZO08rjrOrbFmCBp1yAQ/LT08a5t54oth+J ZEkxUBPxIzyX0MZOetymaxWPDt5bsXePA6OvAbcDuedQD9hNMLDyrPzjwR1jFU8J8+u5 cOmQ== X-Gm-Message-State: AOJu0Yx4KQV1rbUZgbVvOouiGYz/hAwgtbYeNMWrepZUJzXAkuRGlp5V OeLPLd9BhvkCeFoPA8TvM75rLW4m3F9VoVkTJ3v2yfp0kPWpqtg+0w7c1RBT X-Gm-Gg: ASbGncuaWqDdW/8HniQ6+yqgOYehu1CtKFGQWaIaaERaQQoH5pTvlNd5WjbUwvHa2cF rNEXO9mKh12UAYXMl7aDacF9iaXOk2v66K3ygs3cerIcoq39ImpsXRuMOE07HaIlvcF5Qbdki2k tu3xLOrBo6AId/UZ6JMONkLioDJCMaSz3WPkZj5/EJPJ3iL+3c7GBuofFZOU+ElyFUNVf0bSkwr WazQsCw9kjyFE35JfzIDB7yk7aNfqoh0kPEAAh/fkomW5hbSeUkHBfEjpRV6P6mUz8dtfAc0ExI vZbaN36m8RYxA76LxXtgSsNWGX6QBXaQQN3femhaAVyHNydfgiuqXszXhx27PwiVPfByJ6sKIC9 tVp7ridn6 X-Google-Smtp-Source: AGHT+IGd2pf9EccYqmf5QpYONehs/cTqOKpMdDLjeTtDkckmufBfvMvOdg4Y3K090znEidzgbzWqag== X-Received: by 2002:a05:690c:640e:b0:6f9:544f:67dc with SMTP id 00721157ae682-6febf27faecmr257082747b3.1.1741712130849; Tue, 11 Mar 2025 09:55:30 -0700 (PDT) Received: from localhost.localdomain ([2607:fb90:ee62:1559:4ce8:9cd:68c0:bf98]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6feb2c64b57sm27544217b3.119.2025.03.11.09.55.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 09:55:30 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 11:55:10 -0500 Message-Id: <20250311165513.17834-6-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250311165513.17834-1-romain.beauxis@gmail.com> References: <20250311165513.17834-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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 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".