From patchwork Mon Nov 27 14:10:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 44830 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp3382680pzb; Mon, 27 Nov 2023 06:10:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeFxtSTnYD0dm65bwrxSLR4eM54zdeLYKw1MycqE92R1pkv9FYQLm5NSmP8LAv/d37uuwc X-Received: by 2002:a17:906:eb01:b0:a00:1acf:6fe5 with SMTP id mb1-20020a170906eb0100b00a001acf6fe5mr7402957ejb.1.1701094258860; Mon, 27 Nov 2023 06:10:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701094258; cv=none; d=google.com; s=arc-20160816; b=qNFCFXFonfPThLRo0zcxf8B9sqRy8dylm+X9o3lZahkSqmYq2anOan/bGIUAagho83 2dGCWCXkDTkeuwtGQ9Ofzl90uQpS+424LL5SBAtrqBZDXLaBJP5FT/PMU54RtDSPPG6t jquwQ3Cx6x9s2O7cLsC9t+lca2afHov/vor60avBuOjxeGG/3tRagyU17KdhJY+XF0d5 oRET3+DRzaohv4m3o9OS75xHzonLNwStIKr3qHZHXBfsHYdF3kCnyRZdrePxOr7iSmk1 yMdHW6pokJNgWxcN3qcnWcVlFK8YysIWcmwytFtUU/c9Ha+ZwAZwpOgraF3hdExz4alX AqMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=iIadya++sH/ZmvJNUQeh119/vuQezm3Z0Os9ErxoGa4=; fh=+bdjGe20eEUjtjncwA1dnEEVYNfJL4vyhV+sIRR4l+g=; b=onmjo2oReaaAXrOMMxcowhwZtQjF6Ba6ADxJyq4JpY8LvHaFe0t0RwRXuBiBb1Opve 9UY6JwFGCcLIzdrGCoIclBsLvlc2DCM+MuH4Cmp0QrU6wSUp0itHQVb8imFbOWpGnixe 0PdyBwVZmrUChbTHZ8y36Mjaa7EqwMpRU7I/czMse6OwFgYQRWcS+et3AlSzgOGM2byv wZazs3oSkKyUgfUlgHtrJrLwvUc9Yko7fSumUn7R1MuysprpsO6A/AAGUz7LAxohY628 HEBYdnqYNLPCgaUUSDlNPB6mq+plULQhTDTtK7JaHSklsxGmJCnBdkVNcbhuuTiNeFZ9 DpRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=fH8HYKiN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v12-20020a1709064e8c00b009dd949b754csi4995266eju.174.2023.11.27.06.10.39; Mon, 27 Nov 2023 06:10:58 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=fH8HYKiN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A53068CDD7; Mon, 27 Nov 2023 16:10:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA9F968CC52 for ; Mon, 27 Nov 2023 16:10:13 +0200 (EET) Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-67a218d702aso6729996d6.1 for ; Mon, 27 Nov 2023 06:10:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701094212; x=1701699012; 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=yI5vuTzgvGu5HmcVrYfSeJvc+FG68GcBjqNNCg+eAIE=; b=fH8HYKiNPHW7ZDSGyfGcJ/FUPryx9mYw/TOXRuJxGYxk+qlWdbkIslXIkgZ4cVOIJ+ g4imZfYatkdxSpyCOt2BV6GbgnFEjxSgM3/P+31oM6COaGhbafHeGB4FHQPq3FJ4Pznm 9M51dZyiakZymlZaD1QBcdDTdVUs/6fe/kx6foFUZajUaqA5T1Iof4yUSXDHexxqyx5f mu81sJPqtEAGnv57PbiDt1yOCJwx4h8hOT8rpCsQRBmzw+SlSsYUR97L0biT9GVe1kfl YSfW1IL/hg3KlwIhWWYWPE65DYle2hQkxltFCWPdoC4ramPSsmyIyiGYmvut7gI5PjYW DZwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701094212; x=1701699012; 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=yI5vuTzgvGu5HmcVrYfSeJvc+FG68GcBjqNNCg+eAIE=; b=jqsqtjDFhHuOolzswnyjtTnrCVjVucYBfTCbXmmoV5/vqnL0L/RRQ8n0RLM0JN0G48 ATPqolCv9uqibkgDQZDXfDG1gY1ztMU6MddZ5TgYNKfFZhP2Wo66lsHwiyS42GPs5NYg CYxJLTtv7upQ6f3BXgzKzOIAqlj6fexvBOlJeyg3DRl27iHbuvCwNBoFdGqX7y/NQbZ1 CjjXp46C35xbcpaSNik/h09AbCEqt6q9Ib2Ci5VB/cRe+Yw3MqZTA+S715IgX7oIE993 WNTJ9wu3GqRWxxFVSgNikGhsiQ6OFuDVFBMu9KCKPbwOCGZz0b/4V9n2X9X7dOdEdh5q k3Wg== X-Gm-Message-State: AOJu0YzUCq+GtHx+erDZ0pgl321pfv37oykqZ4zQVq4OfrnXWiXRNELs /wykPAyicjhU6vNe4M0/Ejbiafdb2/o= X-Received: by 2002:ad4:4982:0:b0:67a:14fe:f3b0 with SMTP id u2-20020ad44982000000b0067a14fef3b0mr11142499qvx.0.1701094212553; Mon, 27 Nov 2023 06:10:12 -0800 (PST) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id tp13-20020a05620a3c8d00b0077d72f820adsm3699365qkn.115.2023.11.27.06.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 06:10:12 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2023 09:10:06 -0500 Message-ID: <20231127141008.183621-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231127141008.183621-1-leo.izen@gmail.com> References: <20231127141008.183621-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] avcodec/jpegxl_parse{, r}: use correct ISOBMFF extended size location 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lYBEUjnWt1N5 According to ISO/IEC 14996-12, size == 1 means a 64-bit extended-size field occurs *after* the 32-bit box type, not before. This fix should allow correct parsing of JXL files with extended-size boxes. Signed-off-by: Leo Izen --- libavcodec/jpegxl_parse.c | 6 +++--- libavcodec/jpegxl_parser.c | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/jpegxl_parse.c b/libavcodec/jpegxl_parse.c index eb28e80867..7cfdd3e7d5 100644 --- a/libavcodec/jpegxl_parse.c +++ b/libavcodec/jpegxl_parse.c @@ -462,8 +462,10 @@ int ff_jpegxl_collect_codestream_header(const uint8_t *input_buffer, int input_l return AVERROR_BUFFER_TOO_SMALL; size = bytestream2_get_be32(&gb); + tag = bytestream2_get_le32(&gb); + if (size == 1) { - if (bytestream2_get_bytes_left(&gb) < 12) + if (bytestream2_get_bytes_left(&gb) < 8) return AVERROR_BUFFER_TOO_SMALL; size = bytestream2_get_be64(&gb); head_size = 16; @@ -474,8 +476,6 @@ int ff_jpegxl_collect_codestream_header(const uint8_t *input_buffer, int input_l if (size) size -= head_size; - tag = bytestream2_get_le32(&gb); - if (tag == MKTAG('j','x','l','p')) { uint32_t idx; if (bytestream2_get_bytes_left(&gb) < 4) diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c index 630fc8a60b..750872f17f 100644 --- a/libavcodec/jpegxl_parser.c +++ b/libavcodec/jpegxl_parser.c @@ -1342,7 +1342,7 @@ static int skip_boxes(JXLParseContext *ctx, const uint8_t *buf, int buf_size) while (1) { uint64_t size; - int head_size = 4; + int head_size = 8; if (bytestream2_peek_le16(&gb) == FF_JPEGXL_CODESTREAM_SIGNATURE_LE) break; @@ -1353,16 +1353,17 @@ static int skip_boxes(JXLParseContext *ctx, const uint8_t *buf, int buf_size) return AVERROR_BUFFER_TOO_SMALL; size = bytestream2_get_be32(&gb); + bytestream2_skip(&gb, 4); // tag if (size == 1) { - if (bytestream2_get_bytes_left(&gb) < 12) + if (bytestream2_get_bytes_left(&gb) < 8) return AVERROR_BUFFER_TOO_SMALL; size = bytestream2_get_be64(&gb); - head_size = 12; + head_size = 16; } if (!size) return AVERROR_INVALIDDATA; /* invalid ISOBMFF size */ - if (size <= head_size + 4 || size > INT_MAX - ctx->skip) + if (size <= head_size || size > INT_MAX - ctx->skip) return AVERROR_INVALIDDATA; ctx->skip += size; From patchwork Mon Nov 27 14:10:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 44829 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp3382647pzb; Mon, 27 Nov 2023 06:10:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IHxtCGN82hAI4uUb2OojCGM2KrUUq4URkxheAPiMMk6eW0rSNgw38d2X4Kugj5Bh3IBKlse X-Received: by 2002:ac2:48b0:0:b0:50a:71d8:c94f with SMTP id u16-20020ac248b0000000b0050a71d8c94fmr7123212lfg.60.1701094257347; Mon, 27 Nov 2023 06:10:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701094257; cv=none; d=google.com; s=arc-20160816; b=CXOasUPtEs+TAUxgfP5p7s8mttrHKakoOe1p2OmAWtDyFstag7261TrdldkRcnFb1Z Wv9IseAkro2Io95aifd2wq24S2zx0+VIcjCUCLNHTcN8wX+XLMnv1D5RmV8x7GufqI9k XX/MJCeix9eDUf4LgEj7X3tEgX3X55qyKt4IMDRKHxDPT8CsI3A3zaO3XY91Im0efNGg EEO++cFucgSFoXu9Y5n4UaD5ntb1iEM8mMM3fMZxgnlUT6NF0N2iXujvKuELrO5+6KIh VFfEDtA2SOJj4h/9+MjsTGQMoF1K6Xl1vVEDODnFxSv9xN0aZIRvtjGbpIYt3Gu5Sg0z aQFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=0wkk4zIz98mE01nr+ZihwTL4gYjk7a1bA62pKwUWxJc=; fh=+bdjGe20eEUjtjncwA1dnEEVYNfJL4vyhV+sIRR4l+g=; b=c8nBZ8mtaLNl2Xaob0LEpViQnqXE0KbHQC4AKkEzl9o8jrhNkKILSFMQ0l6DIj5jRr U8iML1JNauRNn8avFqOJMsp0sJUr+wivRIdCnp8J5PNi1imEZAdxK02Oj5pLiF8xr+cX lK4cPMZBEL5SXxoN5RHHMkHISNnycmeH/3HFpIB6+gKaf+33bBR3LwSve+kyZIKBW2ee e3D2sPucPpOIakbM70jFwysYJvxYol6MIkDt5Gs1MKJMXsyiAUbFZyD5nsLNfoIo6/hy RljSP2J4it7BFiZxtI3gTTr73JM4MTXgS3RJewrvBMDscOXHwIZtL0Imx6dZuv4UvDN0 cI3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=WnnttLh2; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 22-20020a508e16000000b0054b4f63354dsi1574253edw.493.2023.11.27.06.10.56; Mon, 27 Nov 2023 06:10:57 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=WnnttLh2; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4F7068CF29; Mon, 27 Nov 2023 16:10:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78DF268CD3F for ; Mon, 27 Nov 2023 16:10:14 +0200 (EET) Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-77773d3246aso3173485a.1 for ; Mon, 27 Nov 2023 06:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701094213; x=1701699013; 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=FBbZANov46ynIfWYgvrkbCcQDXJVS2J3qSQa6VJhbNw=; b=WnnttLh28dpbUBdj1rsOuDMI4MiKJUSpNizIySZxmIXWIoqnDK8SWklpR3iTlnHp4F 30A2n9Zu1kBWHesus4AVlpYKVPYckZTFi6S8r+QGNonf7ncFZVR81645+UkgN5c+oveS vBcqqmQPdDIdkPHhF7heV6HNzYf5faMjrl5h6zioygpKvnaFiADj4xdUmgohjqQ2HNPD QTU4LLdS9cx0kpCUAAgkjOXvph4HkKPw8ZFoDzaAcpsu9pczLnUWVpCFUpzUYLbn7imY YFvSnmhH9w253JC9EPtVoVRTpG1JAS4zJ/NEZKbpfPENCM/Kgg1cDDLyBWOP7zvkNXiO JCzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701094213; x=1701699013; 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=FBbZANov46ynIfWYgvrkbCcQDXJVS2J3qSQa6VJhbNw=; b=NlcHbQoBqtihbHfCyoBXrX5JZ3NbZj+5iKK5zZL6qRAm35nBBg7ZSazywFZXJCa9iK +EDcASiM2HBa9SGh/yewlfcRiBHRU2q9J2TMbzfEUG8wyIcv3v1gmz84C5xf5VJ9Psx/ UCH8+QzyIb3iYw4MBC/MNVbaMQlHFzdxEjyz9LQ96REB79ZlaCjc/ZZFVgRh1Zelo4q/ vTh/9s26GfO/MlxOfPLtZTUF8F5ioCpvjT1aFwcOo5yXG8kdHcQ4mU5JeKKWuCe7DH1g rPNQiwvQ9MPtJWzq5Qdk6ndFlhx2If3I0ZYtjSX2+PqiDXyoRW9oRkzbSRwAze06kNLZ V4sw== X-Gm-Message-State: AOJu0Yz2YyuwwnqQkuzmzaqfo2dQrDuXMZPLG4/nMzcQD4bpVKUsZTMh wH+9u6VnJ57h36anDs3ikhwpyKqxQjQ= X-Received: by 2002:a05:620a:25d3:b0:773:a789:cd15 with SMTP id y19-20020a05620a25d300b00773a789cd15mr12691765qko.6.1701094213142; Mon, 27 Nov 2023 06:10:13 -0800 (PST) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id tp13-20020a05620a3c8d00b0077d72f820adsm3699365qkn.115.2023.11.27.06.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 06:10:12 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2023 09:10:07 -0500 Message-ID: <20231127141008.183621-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231127141008.183621-1-leo.izen@gmail.com> References: <20231127141008.183621-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] avcodec/jpegxl_parser: fix parsing sequences of extremely small files 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uPUOPPw7CFe7 This patch allows the JXL parser to parse sequences of extremely small files concatenated together. (e.g. smaller than the parser buffer) Signed-off-by: Leo Izen --- libavcodec/jpegxl_parser.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c index 750872f17f..006eb6b295 100644 --- a/libavcodec/jpegxl_parser.c +++ b/libavcodec/jpegxl_parser.c @@ -1454,15 +1454,21 @@ static int jpegxl_parse(AVCodecParserContext *s, AVCodecContext *avctx, { JXLParseContext *ctx = s->priv_data; int next = END_NOT_FOUND, ret; + const uint8_t *pbuf = ctx->pc.buffer; + int pindex = ctx->pc.index; *poutbuf_size = 0; *poutbuf = NULL; - if (!ctx->pc.index) - goto flush; + if (!ctx->pc.index) { + if (ctx->pc.overread) + goto flush; + pbuf = buf; + pindex = buf_size; + } if ((!ctx->container || !ctx->codestream_length) && !ctx->next) { - ret = try_parse(s, avctx, ctx, ctx->pc.buffer, ctx->pc.index); + ret = try_parse(s, avctx, ctx, pbuf, pindex); if (ret < 0) goto flush; ctx->next = ret; @@ -1471,7 +1477,7 @@ static int jpegxl_parse(AVCodecParserContext *s, AVCodecContext *avctx, } if (ctx->container && ctx->next >= 0) { - ret = skip_boxes(ctx, ctx->pc.buffer, ctx->pc.index); + ret = skip_boxes(ctx, pbuf, pindex); if (ret < 0) { if (ret == AVERROR_INVALIDDATA) ctx->next = -1; From patchwork Mon Nov 27 14:10:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 44831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp3382954pzb; Mon, 27 Nov 2023 06:11:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6yRDWWemK5NuaSfVEhvt/P3gxL5fyr/qQsEXZ7CHVf5W94V/sAOVGx6xzKK23T6mZGNbs X-Received: by 2002:a17:906:2209:b0:a02:9891:29ba with SMTP id s9-20020a170906220900b00a02989129bamr8031954ejs.15.1701094272941; Mon, 27 Nov 2023 06:11:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701094272; cv=none; d=google.com; s=arc-20160816; b=WCCi4ZxlHDE89eb76fOIX2FisUnqSbxsnVEte+iq6BTq0kHXoFxk5VEgoE0eziAjsL Kih97QYWJsUbJ91b9syCfe9agyf0zjgmUUraGYIfARkqwN8ysHN0IihANx5Hwk/QyU+V Vepcob3VWef4TYORoTsMgobJB2MZDZnQFnAU7CcRrQ893EY9QG0G5khIZcdf9LcFyZz7 TC6CspYqv2FvHg4v4PYvdBiBdNmUp4iT7fgSnzA+cgOzpSn/4rCR2pmSWSNtDl+XUJt2 bIU7av1F81of0mMiF1n5be6G4arcSR/fjGzehYQPlUvdcHTSvEiMZS3b4CnoXy7DNJeW Krwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Ca00pt3RfpJf38QdYPBOqIe1BB7Thn2DCIZyL0erA5k=; fh=+bdjGe20eEUjtjncwA1dnEEVYNfJL4vyhV+sIRR4l+g=; b=JYoM2et+Jjv0MdphadN+51+mp+VjYk7kUcUg+F6J1xRLiSNB62N9ltgwCadibdmTW5 oNhD1uXDk5uZnJyB/PWlEzNpo2qb3+8tjvA2qVrMkj4zKEm6mUXUMQ9X54yLGBAA0xKM 1aySXyE7R2NsVlylSHcohyYIDQxkryf9rO3SMbdYSKPp4torTol6KfhqmeJ9APP/ksEP mOoOoRUCj4blAUibe2oTcYUja8Cnz6mokAaZZD2VpDv3n6EQ+Y8OSbqk3mlcfhWA122t g8RVKm8BgvFVH0wAONQ1RMQ8ejlwI1ukOhY9VxmyT06KxDbMmBTTKmw5Qvd5x7XUY9Gw vw7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=GUKWtMpA; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m8-20020a1709066d0800b009fd2b8178fcsi4778471ejr.82.2023.11.27.06.11.12; Mon, 27 Nov 2023 06:11:12 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=GUKWtMpA; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B97D68CF4B; Mon, 27 Nov 2023 16:10:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DD5668CDE1 for ; Mon, 27 Nov 2023 16:10:15 +0200 (EET) Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-77773d3246aso3173685a.1 for ; Mon, 27 Nov 2023 06:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701094214; x=1701699014; 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=hk8h4jsnkeUsgK3xI0oQ878Stzs6eL0LwqSHro9nwd4=; b=GUKWtMpA/+6tMH1i200lRdvkY6MRQnWF5d7YmNkU+p1Mdpgd6fl32JBiSWD9BwyWxh fi3Pjf/miHuCygUe7whOIS+GWU75a3p/HubiuHBLjESwvx8ewAvR2RHrQAFpeHSPF9r6 mb9ilfmzSVw3qAEyZvYQuAuZmExUVGFQiMHVAIT9a0vfi8XouppazNPP3GKmEmCCNuPa YY6wWM+HnhRLDL7xt84UC+dDBchWUKrsIv5QRQGBGWNUUlpSliP5KpO2NSusH4JuV6Lg /crMyeOnCmmh0IIRg6ouM0uYH+FN8g8k37Q2r/Ip3kM+o1XPQKvozI0xo0R8hDR9oz1+ ZH9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701094214; x=1701699014; 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=hk8h4jsnkeUsgK3xI0oQ878Stzs6eL0LwqSHro9nwd4=; b=lh4PuVWo4Czouq1LkqdVVxd2dlIlOBLjgo2sKiju/Symo200SiLWFfCz19hPbXdoX4 QnEvYCvAHmPLGO9aTsdi7I9ouyoeI0i1DUtMsnce7HVV3WT2SEhQlaTwZMy6SSJL5tZG MksqWzUw2Nh54xwCh8wX11j8HcWUApQA0FM41YkrhnKdb/DAw/+iGDy1A9AvyNCtKZJb Ri+FoLEeiCjQkT6TW6yv59vbkT8neiwi7TfxQleluE12Ee64FWw49gletagvW3i5mr40 6aNXcaFsN64aZreqyHgiPY8E/NjuhzmxwmNEpfI8aVZvXeM4sooCQQAgfvsFMpAjUIhj FiEg== X-Gm-Message-State: AOJu0Yx+iHQKZXO8kB5QzeWyMAJtiYdvLaFy/tB+8HgfnFNbXVKOH8W8 OKaQlEPeTy7SpVhTs+K3fUN8e4wYpZE= X-Received: by 2002:a05:620a:460c:b0:77d:5f90:36da with SMTP id br12-20020a05620a460c00b0077d5f9036damr13794612qkb.1.1701094213760; Mon, 27 Nov 2023 06:10:13 -0800 (PST) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id tp13-20020a05620a3c8d00b0077d72f820adsm3699365qkn.115.2023.11.27.06.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 06:10:13 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2023 09:10:08 -0500 Message-ID: <20231127141008.183621-4-leo.izen@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231127141008.183621-1-leo.izen@gmail.com> References: <20231127141008.183621-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] fate/jpegxl: add parser test for extboxes and small files 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5MZLvoJDIoUa Add a fate test for the above commits fixing extremely small files or files with extended box sizes. Signed-off-by: Leo Izen --- tests/fate/jxl.mak | 8 ++++++++ tests/ref/fate/jxl-small-ext-box | 9 +++++++++ 2 files changed, 17 insertions(+) create mode 100644 tests/ref/fate/jxl-small-ext-box diff --git a/tests/fate/jxl.mak b/tests/fate/jxl.mak index 057d3be0e1..d653eb644a 100644 --- a/tests/fate/jxl.mak +++ b/tests/fate/jxl.mak @@ -14,3 +14,11 @@ FATE_JPEGXL_ANIM_DEMUX += $(FATE_JPEGXL_ANIM_DEMUX-yes) FATE_SAMPLES_FFMPEG-$(call FRAMECRC, JPEGXL_ANIM) += $(FATE_JPEGXL_ANIM_DEMUX) fate-jxl-anim-demux: $(FATE_JPEGXL_ANIM_DEMUX) + +# parser tests +FATE_JPEGXL_PARSE += fate-jxl-small-ext-box +fate-jxl-small-ext-box: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/l.jxl -c copy + +FATE_JPEGXL_PARSE += $(FATE_JPEGXL_PARSE-yes) +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, IMAGE_JPEGXL_PIPE, , JPEGXL_PARSER) += $(FATE_JPEGXL_PARSE) +fate-jxl-parse: $(FATE_JPEGXL_PARSE) diff --git a/tests/ref/fate/jxl-small-ext-box b/tests/ref/fate/jxl-small-ext-box new file mode 100644 index 0000000000..0f9adfe075 --- /dev/null +++ b/tests/ref/fate/jxl-small-ext-box @@ -0,0 +1,9 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: jpegxl +#dimensions 0: 8x8 +#sar 0: 0/1 +0, 0, 0, 1, 104, 0xd12d1d10 +0, 1, 1, 1, 104, 0xd12d1d10 +0, 2, 2, 1, 104, 0xd12d1d10 +0, 3, 3, 1, 104, 0xd12d1d10