From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A18744D685 for ; Sun, 1 Jun 2025 16:50:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 44A2068D599; Sun, 1 Jun 2025 19:49:47 +0300 (EEST) Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 84C3068D521 for ; Sun, 1 Jun 2025 19:49:38 +0300 (EEST) Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-2d060c62b61so3465842fac.0 for ; Sun, 01 Jun 2025 09:49:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748796577; x=1749401377; 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=YIXBL12GRsaTl35/BTU5gxcDIH+YgEKw5hXxjWDr0qc=; b=KwlJTx+ZFUcDp6KJTpnGfJfUuELVCqDPTBwj3/CW9t3vgrh7RzQiTDVkzN6dt1c73u a1qIPWbmIATNKFQA71Kobzz06Mf0uCmZxIGSeDQyIv+6QFUlXrWRRgSwW9xstcogQp/6 6veOrNmHr04Gxak1bXUq8vckmvbd/RXBLJmoJtz36jHV163g2CcFrK1884BHHP5BsmtX OuPdALNkbGZToDAX7wtKKDjDbFOSa9xseIYaYy2wa7cvOMYCqWC/EZgt8jgNTQSWWOGr LeIYXxZqN/1TYtWkFEfEEctF10BAIt97w8NqnfzZcA56372gqN8AalDcm7621cjZoIPG rpkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748796577; x=1749401377; 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=YIXBL12GRsaTl35/BTU5gxcDIH+YgEKw5hXxjWDr0qc=; b=gUO//ze4oYkM3F8Zr2/3Z+UPWq+ipbwFdsTGa50v96MsjIs2QQO1W/B9F2iPj3l+0f x8XOIayeKMd/N9iD07c+dBWzUrW2PbQyNA4goJj+e+hGP6qQr3egzJuSsJgkbCJSJe0C wcyI2r2Pjmgg04eull+ZfqOqJ8l5Ks2DmE1aVR/OVrhR0uJlVD7CMwX1vspH3Zno3WAi AizKEumQCGZG8ipBAfZhpZjIMrLcKNB6CM09ZHUo6jBq/K3IfsdOSCptixUHpeFW3hJr uBLBFV3PMs1C98QyLXa/sQsVS0fXi+/TtZeHGRfGHGyqTpoI7w82V4I7J2XXl3IReg7r F8+g== X-Gm-Message-State: AOJu0YxV1QR3bGArktHHSvnDiC9yd4/a4OoZ8Ul7d9fadP7APiGm+Wyk oEUZdeMtC02aEp9J/kUoVwkBJ48Km48TydoxdkFtnbL0sMvzblnJtbDJc63ltori X-Gm-Gg: ASbGncuEt4oUURy8XTOm0CJL+IC4+5bfypd4Z7H1bMWncxFH7/GEIXtNZI/XCorTYSC BdhXZXYBgF4kyEvpg8tlnU8PgrKyao0LkoM7QieOG//kPclvwUY2KrrC6ONNXI1+JIKZsHVOL5t txZAqyWZWKj4XpeWsXbhvWQ/86N83F+1n6c+5ctz0/YSw6vamw4q6CW17FGvF/ZJ0hA98OXJMO6 T5HPturStnQuoJ74VgK50d8oBKIAFsI5TGFyEVpRvE5qLnHLIfRK4lwOFNIDhEYMTmexffPoaPT XCXxfdTWZomO7+amrBO4DBVqe6GbglELgBn9IsntYt39wztLxbZm4SzJuOPE6xJ/fsZTK1IAX4H ftOrdhU5/e7mvEe75nSY= X-Google-Smtp-Source: AGHT+IGzdqt1+DkrfFNoqcjw1/3cTumhfGVT5CrJKBlppXso6M3r633nwi8uORwPedC5NPBtbM8qUg== X-Received: by 2002:a05:6870:d10d:b0:2e8:fd0f:a194 with SMTP id 586e51a60fabf-2e92a1b1b73mr4385942fac.15.1748796576810; Sun, 01 Jun 2025 09:49:36 -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 586e51a60fabf-2e906c13c13sm1467151fac.45.2025.06.01.09.49.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 01 Jun 2025 09:49:36 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Jun 2025 11:49:29 -0500 Message-Id: <20250601164930.72816-4-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250601164930.72816-1-romain.beauxis@gmail.com> References: <20250601164930.72816-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] 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 | 7 +++++++ tests/ref/fate/ogg-flac-chained-meta.txt | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index d66b85b09e..e81e4021a1 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -85,6 +85,8 @@ 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 > OGG_FLAC_MAGIC_SIZE && !memcmp( @@ -95,6 +97,11 @@ flac_packet (AVFormatContext * s, int idx) if (os->psize > 0 && ((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 1; } diff --git a/tests/ref/fate/ogg-flac-chained-meta.txt b/tests/ref/fate/ogg-flac-chained-meta.txt index 28e22aa29e..5abf37dcee 100644 --- a/tests/ref/fate/ogg-flac-chained-meta.txt +++ b/tests/ref/fate/ogg-flac-chained-meta.txt @@ -5,6 +5,7 @@ Stream ID: 0, frame PTS: 0, metadata: N/A Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: N/A Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, frame PTS: 0, metadata: N/A +Stream ID: 0, new metadata: encoder=Lavc61.19.100 flac:title=Second Stream +Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 flac:title=Second Stream Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: N/A -- 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".