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 94E314E6C3 for ; Tue, 6 May 2025 14:20:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5823468B792; Tue, 6 May 2025 17:19:52 +0300 (EEST) Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFE7868B672 for ; Tue, 6 May 2025 17:19:43 +0300 (EEST) Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-60638c07cabso3047419eaf.3 for ; Tue, 06 May 2025 07:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746541182; x=1747145982; 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=dwN8PKXeyGdPXf54UF8mMfXYo3C4p6ue359HdS3uDh4=; b=VumPQ3AzRrSmDRjYsZCbxtQLFZPHfLSUt1g/PZWFsOWXBDh9UpHjciupwC8TfATtpB ab0zxg0jHLSlLi5eYvAWTJfYhaXNJrRPWlbzphkbjsg6+XAg7e4xHLT0K+elzVSzr2Lx dJUygs2p5ysnKxG4Sk2ksfqMhG/2HE+v73+SpkMWNwM/T48ewVeuOjP1MpcnmNm3+Gm+ XBC+maSIqSE/MsbKY2uMj6Y44rCqtFX7AaZkW6Whdc6i65IzPxgR0ogV/z54ThyjYSGf 7TyQ7QJiF1ZefbwQLLGySAvL1wgiAcTL0Fm7GitBYgqjjduVFs4qrzk/KzUm7/3VPcto FQzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746541182; x=1747145982; 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=dwN8PKXeyGdPXf54UF8mMfXYo3C4p6ue359HdS3uDh4=; b=YfS7kyNWduipoJosZjfB9CToZ20xc5FweUH1Ly+gE+AV+Y9g7d3hfLp+yzbe53xMqM xt7dWPPt+aTVo71u7eXt4rT1JTVu+JKoPp57vB49cyIrXC6mgB1PuL5+fNH5JPA5RKKJ ZSTkNhmC7LAOPkimgzFze0yGFV7p84VhSJIOvSlm39mVyY4BnxQA11JlJ35vxW9cMdn2 s2QA9L6NUj40xfB9kuMwJ6tLfowiZ9a77a0XadRMi2a4AygVPttauLN2og+o1vAi3N+i a/4C6z2BP2QAwV3XZek63ESx/s5qhnPcTwjzFH/R9L66aYX7nUVb33gr+fhQuxfIc+P+ kREg== X-Gm-Message-State: AOJu0YzRv/4KtlFdGo7Fan7ms/GSZOlGyBEWzjPyQs1KIbe6fFKVQJYS UxbPF24zsScxPRHghGRLgYdPSYIp8CX4Ntm/vIZvxQp2bMpSD8faBX/0qYdO X-Gm-Gg: ASbGncsDHxhBophbMitdrddG7BUMnf3ZItPHySQR4tLwEXIW77WqvGLdmpbSLq+hpp1 ZDHkJPShLGW97T9DEKdO+WrNEuMKJIt4jmobuS9p1UWJF+q3cej36QWr+5PlbQdFxTNK7iayLHM E0AvuhB0p2jOPedu/krrMHAe2OUAVuWpPj6nPjQSCsskjQL064sko6BEmHlW4A+1trl0YuUAsDC htAFZ8EPQXQh1TjsOiJtp+/8Dxf93azzFbrzC2HrMZmFOQXH4iwjfhgjL0qJ/gPLJt6nuP6l5eh RlTHX3Lg1JoAqtPi+OK8weweJnOcqChlj2wVzIIWy+IF0vVvD0a4vH2WrkMksoXua0Ymq9eUyTg 8i34qx1tfVJ3PXViBmw== X-Google-Smtp-Source: AGHT+IG2xG1h6MfZSppOX6KlrxTznADE5SLG3gvlC6D/1KpeJIzPDu7LMzt69YYuI5iZE3OkKLhAsw== X-Received: by 2002:a05:6870:8990:b0:2d5:246d:4b67 with SMTP id 586e51a60fabf-2dab331fea1mr10032160fac.24.1746541181760; Tue, 06 May 2025 07:19:41 -0700 (PDT) Received: from macbookpro.lan (ip72-211-125-114.no.no.cox.net. [72.211.125.114]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-2daa12508ccsm2713442fac.43.2025.05.06.07.19.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:19:41 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 May 2025 09:19:31 -0500 Message-Id: <20250506141932.73142-6-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250506141932.73142-1-romain.beauxis@gmail.com> References: <20250506141932.73142-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 5/6] ogg/vorbis: implement header packet skip in chained ogg bitstreams. 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/oggparsevorbis.c | 11 +++++++++-- tests/ref/fate/ogg-vorbis-chained-meta.txt | 3 --- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 9f50ab9ffc..8b4ae872d2 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -418,6 +418,7 @@ static int vorbis_packet(AVFormatContext *s, int idx) struct ogg_stream *os = ogg->streams + idx; struct oggvorbis_private *priv = os->private; int duration, flags = 0; + int skip_packet = 0; if (!priv->vp) return AVERROR_INVALIDDATA; @@ -480,7 +481,13 @@ static int vorbis_packet(AVFormatContext *s, int idx) if (duration < 0) { os->pflags |= AV_PKT_FLAG_CORRUPT; return 0; - } else if (flags & VORBIS_FLAG_COMMENT) { + } + + if (flags & + (VORBIS_FLAG_HEADER | VORBIS_FLAG_COMMENT | VORBIS_FLAG_SETUP)) + skip_packet = 1; + + if (flags & VORBIS_FLAG_COMMENT) { vorbis_update_metadata(s, idx); flags = 0; } @@ -505,7 +512,7 @@ static int vorbis_packet(AVFormatContext *s, int idx) priv->final_duration += os->pduration; } - return 0; + return skip_packet; } const struct ogg_codec ff_vorbis_codec = { diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt index b7a97c90e2..1206f86c1f 100644 --- a/tests/ref/fate/ogg-vorbis-chained-meta.txt +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt @@ -6,10 +6,7 @@ Stream ID: 0, frame PTS: 128, metadata: N/A Stream ID: 0, packet PTS: 704, packet DTS: 704 Stream ID: 0, frame PTS: 704, metadata: N/A Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream -Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, frame PTS: 0, metadata: N/A Stream ID: 0, packet PTS: 128, packet DTS: 128 Stream ID: 0, frame PTS: 128, 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".