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 8AEDC4C8A8 for ; Fri, 9 May 2025 23:44:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFD5A68C796; Sat, 10 May 2025 02:44:25 +0300 (EEST) Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1375D68C6BF for ; Sat, 10 May 2025 02:43:47 +0300 (EEST) Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-3fea67e64caso2422030b6e.2 for ; Fri, 09 May 2025 16:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746834225; x=1747439025; 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=1tOcUxs3dyPis0UO7LMMLXqDLBbgAN5mgK+xL4cDfBM=; b=CM9fagxnglG5VyvPrNTuQcyX+Z6z9B90OtADHq367EYhyGy4CWYoO9tvcWMN79sUpv chhDWQy3MhtxGS3wwvnaIXf0nu2pQd+Ce25gcuVNJSLIbbGkVLrYDOA3sekCoMOISuhr dsWyLwZeE1VtPAMA1JGFsjw0mNGaTuR6e/1e5zk7mFjuC840xiMwKzbJxoGuny92QEbJ YIbFkbfnFSShelc+l27s30bE/0Gzgai7+XExJyRgulYpXVisSrK4Mh3LROPt+xJCNUf/ 95klBR7mY+PGU2jLrpBR5c+7JCvup2D2AqUzcNQ68SAxLBGKXpIkx62k0MGSIfZbv9Rm uR/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746834225; x=1747439025; 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=1tOcUxs3dyPis0UO7LMMLXqDLBbgAN5mgK+xL4cDfBM=; b=WA/hGmcTdPJq/QsaCEyCflCyl5mwwxM2tbwHT4RsOaA1Kh40jvH3ECRupwpBECmbII Fm2Yd91J+DPT6GlSThHetoHtoOGv3/02TbA5brCUli22yCGS1pyPEfQS39kpjrzRT0bj 3m+J3GUZl2JZsucugsj2RPzECF3gYpZpDnll6K30RBmNzfCSv/zSMI4IuAVs3VfksTqW DbP3ly9GyfghRD396Hr1CYftiT/nJuhQFA44zEsWreXb76nkFGtP5RZjK7K+TtfdG3PV 6hR/T19diBMVPzbez69qYLJ0l6XG2Lpak+tBEdjMNZh3lexSsOv6HOIcrHOFasfiIKUy BgcA== X-Gm-Message-State: AOJu0Yy4cDBz7esEDxOfgNfRDkzd1rw/RpUQwMsZUhIETRXriRaKQxxN eP95gIJzSxkt1V4ut7TP1XTPUkrRncE05lDq2ziGAr3+tfJ7/8DGAhNAooW1 X-Gm-Gg: ASbGnctneDNwzgYJB8fQABEqUo+PZciFGv6FSfAsHHJHwGtwSL4LNWSk76FD0zcm9tT JO3vjhRUuIqN3or7t4EcZhUrJich84qReAhwE5lz+1F0OgK7IImAZW3wKGhQViXE3BwbgeKT9dP 1OvZY/hV7wDVe/w67CSHC8mMnPv1CE+W/g/wQZiZ9RYFddCBb6zPIf+cJSu8UsTGw394OVxLJ+S XQxHddTJZEMGQHzQRDPW2iz+kU+bvQim4/pDI+MAb0Y5osTOpS8iZL0Lwya+SUVp/S2mwdz7zG9 x104CNCZpnzCENHACRgimRBEEuXPdDlEW4bof568KNPmepRqCbL8xWG65/pB2jrNBelsZ5Cv1VD lWRAOwmwsveANYSPs X-Google-Smtp-Source: AGHT+IFIwRiEu33XmGCvl5/OnPwSoK/7To016dw1iP7WiwiZTqeg7hiCrzGHArruD9IQvBkg5wHDjA== X-Received: by 2002:a05:6808:d52:b0:403:3fb7:3870 with SMTP id 5614622812f47-4037fe39abbmr3825751b6e.10.1746834225290; Fri, 09 May 2025 16:43:45 -0700 (PDT) Received: from localhost.localdomain ([2607:fb90:e33e:5272:5990:2d1e:9f2e:c4de]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-6083fe52271sm668499eaf.21.2025.05.09.16.43.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 May 2025 16:43:44 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 May 2025 18:43:24 -0500 Message-Id: <20250509234327.71039-5-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250509234327.71039-1-romain.beauxis@gmail.com> References: <20250509234327.71039-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 4/7] ogg/flac: 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/oggparseflac.c | 28 ++++++++++++++++++++++-- tests/ref/fate/ogg-flac-chained-meta.txt | 2 -- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index f25ed9cc15..d66b85b09e 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -27,6 +27,8 @@ #include "oggdec.h" #define OGG_FLAC_METADATA_TYPE_STREAMINFO 0x7F +#define OGG_FLAC_MAGIC "\177FLAC" +#define OGG_FLAC_MAGIC_SIZE sizeof(OGG_FLAC_MAGIC)-1 static int flac_header (AVFormatContext * s, int idx) @@ -78,6 +80,27 @@ 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; + + if (os->psize > OGG_FLAC_MAGIC_SIZE && + !memcmp( + os->buf + os->pstart, + OGG_FLAC_MAGIC, + OGG_FLAC_MAGIC_SIZE)) + return 1; + + if (os->psize > 0 && + ((os->buf[os->pstart] & 0x7F) == FLAC_METADATA_TYPE_VORBIS_COMMENT)) { + return 1; + } + + return 0; +} + static int old_flac_header (AVFormatContext * s, int idx) { @@ -127,10 +150,11 @@ fail: } const struct ogg_codec ff_flac_codec = { - .magic = "\177FLAC", - .magicsize = 5, + .magic = OGG_FLAC_MAGIC, + .magicsize = OGG_FLAC_MAGIC_SIZE, .header = flac_header, .nb_header = 2, + .packet = flac_packet, }; const struct ogg_codec ff_old_flac_codec = { diff --git a/tests/ref/fate/ogg-flac-chained-meta.txt b/tests/ref/fate/ogg-flac-chained-meta.txt index ad20ba935f..28e22aa29e 100644 --- a/tests/ref/fate/ogg-flac-chained-meta.txt +++ b/tests/ref/fate/ogg-flac-chained-meta.txt @@ -5,8 +5,6 @@ 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, 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: 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".