From patchwork Tue Aug 1 13:30:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 43059 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c89:b0:130:ccc6:6c4b with SMTP id fq9csp412683pzb; Tue, 1 Aug 2023 06:32:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlGnfV+B/Vl2sZwx2sHdNVCQcescrL9UwVLF/9TNoAXWju1v4cszPdTvRxh/EQA/AtN1Gi+h X-Received: by 2002:a2e:3817:0:b0:2b6:da66:2d69 with SMTP id f23-20020a2e3817000000b002b6da662d69mr2443170lja.28.1690896727682; Tue, 01 Aug 2023 06:32:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690896727; cv=none; d=google.com; s=arc-20160816; b=dxXyzASDXy8vZG9iw0nhAPsMB6yJk4iWuFugqKmIZ+b+GcvE7xxTIWIOIE4S38vU2/ OhnOD2in/l6HwQsAXL1OufRncO5grNsO+E5HRDxOLcnKUM69eYejBMm8FvQrvFCun/K6 P5vxXzb8FnpnOCtWfRevN0eyrhf8Kq6nukYfTDuQcZElT+bOAscAaEbCje36Sw9SjXkD 9j3JK1wAb+KIbLGofK4Zh0EwDRERhNSk0EkZ8AY4i2ud9CGmsrnYvonw8pqJgsa1Xnv+ XB18HNbYuArV31tQxJfcx+73rYp8r46yVJzJ1UL615RpYNKgpy+OzfR7B/mDSnqmiaV7 hcYA== 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=8WqnCxch45a4+Nib5jNDLIl7Kr/NDwHiPscO3wcyVTw=; fh=W57KVLPaTz0tbsYsrKIbKYuBNANpg4Tl/mHbnGjtYGU=; b=GbtrB8JlanyvvocE1qgxpCQ8Em089UOXwy7pMwuPc0RpGBnA0iOZI6DR/N0+xB0Rsr I96OG3yc7JZa9suOZM25PnVhPq4Sf33hMsxBc5wokc9yBtrdPw6YvOQ2n1FpLR02Pu92 gaNdKtvYeYeizv4o8Emmfkm2sxxNTtwGDdTqn8LIvSaaDJABtiIE0TyR1IBvkZNqi4rY BhG9fRgsdKiIyJqyjbg1guEZh6S7XPqXvO1tlbcrjqguJjXBevciTeneHjLuslhCBMln gdmhViWjxgz6z9Cf/HIKkPgTOiMiRWqyz2P7t1vIf8O5o8sH51Cwfrj5o1Um/HEZ7yqv /1Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=JJBFDitQ; 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 a4-20020a1709065f8400b0099bccb6280csi9260597eju.294.2023.08.01.06.32.07; Tue, 01 Aug 2023 06:32:07 -0700 (PDT) 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=20221208 header.b=JJBFDitQ; 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 62D2768C4F6; Tue, 1 Aug 2023 16:31:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28CED68BFC8 for ; Tue, 1 Aug 2023 16:31:02 +0300 (EEST) Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-565e4741723so891855eaf.1 for ; Tue, 01 Aug 2023 06:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690896660; x=1691501460; 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=9qxzKsHbaQUcJaCGOQPE2X+DEXeXByqiHZBh6WDOdtA=; b=JJBFDitQ8YOjkkSTESn7Fj6zILX1/IZjI4XZCwmNnb3XNmcX6TtXi3rNlsEpY9J60F QoQFBmEcjcbCQa3ZSyFMJUIiRHWNFTdEXV6ex4kwTZFuaPFXo64dZ7lLe7EEKfxkiUxt JK60CPG7CxS4hUFicspf97MqcyTGSkVgc4o3jS3vRFerniLKwT7K/owpwU/yblpNB+tT szXdcPdHST0oaUXC1B+d+LrzaIzD/E49SjLUUVvMbtFG2BCFFG2aOpihBPyz/USRGi4R /SqFf8BoBu4vRcgRwkJQOJrPnqTmLfkjiu5HbwhTUlLP8GiaoldW90Fk3ueX0pxQh7GF buOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690896660; x=1691501460; 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=9qxzKsHbaQUcJaCGOQPE2X+DEXeXByqiHZBh6WDOdtA=; b=dIV96tUGxCfrxXIubywwD17k3ElS3Bt8qgCKWSfzCq1HtWkCIHri2xYCuRa1A++3Di 79dmnBcP28kn3I1fpzbfFCH9TMa1h9ExbXnxKuguuH33Set4NWvninRIGhh+/7dVQbxi drzPmGTi3FX7gGSADntXkSjjgmT3GVdykrhS62Px1ZpvILV/dlrsD9kapOwvASbFfVe4 Pufwk2aNwv7dsj0THnbw8955cjEQdm1kjZRZpyjg/SxgCGOBZTARteldMckNuT4O69kt HFyH8FzZAvn1MMPHTjN9aN4xNqiAzQ33T/s7otloPfmoxUyVKEjmMj3HJIgE1kbqBv+T 3NJw== X-Gm-Message-State: ABy/qLZYrj1ytbtxmBmlkbQ6kGAxmGR0dIDXVvH0yjRJhDqW1T3Hef0B apv+8qHJs8wctSHl7OrCVwF5V5r0+7k= X-Received: by 2002:a05:6820:2108:b0:56c:5e21:c72d with SMTP id cd8-20020a056820210800b0056c5e21c72dmr8213541oob.1.1690896660605; Tue, 01 Aug 2023 06:31:00 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id x84-20020a0dd557000000b005463e45458bsm3738130ywd.123.2023.08.01.06.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Aug 2023 06:31:00 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 09:30:55 -0400 Message-ID: <20230801133055.256537-6-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801133055.256537-1-leo.izen@gmail.com> References: <20230801133055.256537-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 5/5] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim 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: citsE6rHp5lx Adds a fate test for the jpegxl_anim demuxer, that should allow testing for true positives and false positives for animated jpegxl files. Note that two of the test cases are not animated, in order to help sort out false positives. Signed-off-by: Leo Izen --- tests/Makefile | 1 + tests/fate/jxl.mak | 16 ++++++++++++++++ tests/ref/fate/jxl-anim-demux-belgium | 6 ++++++ tests/ref/fate/jxl-anim-demux-icos4d | 6 ++++++ tests/ref/fate/jxl-anim-demux-lenna256 | 6 ++++++ tests/ref/fate/jxl-anim-demux-newton | 6 ++++++ 6 files changed, 41 insertions(+) create mode 100644 tests/fate/jxl.mak create mode 100644 tests/ref/fate/jxl-anim-demux-belgium create mode 100644 tests/ref/fate/jxl-anim-demux-icos4d create mode 100644 tests/ref/fate/jxl-anim-demux-lenna256 create mode 100644 tests/ref/fate/jxl-anim-demux-newton diff --git a/tests/Makefile b/tests/Makefile index e09f30a0fc..7b80762e81 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -201,6 +201,7 @@ include $(SRC_PATH)/tests/fate/image.mak include $(SRC_PATH)/tests/fate/imf.mak include $(SRC_PATH)/tests/fate/indeo.mak include $(SRC_PATH)/tests/fate/jpeg2000.mak +include $(SRC_PATH)/tests/fate/jxl.mak include $(SRC_PATH)/tests/fate/libavcodec.mak include $(SRC_PATH)/tests/fate/libavdevice.mak include $(SRC_PATH)/tests/fate/libavformat.mak diff --git a/tests/fate/jxl.mak b/tests/fate/jxl.mak new file mode 100644 index 0000000000..057d3be0e1 --- /dev/null +++ b/tests/fate/jxl.mak @@ -0,0 +1,16 @@ +# These two are animated JXL files +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-newton +fate-jxl-anim-demux-newton: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/newton.jxl -c copy +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-icos4d +fate-jxl-anim-demux-icos4d: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/icos4d.jxl -c copy + +# These two are not animated JXL. They are here to check false positives. +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-belgium +fate-jxl-anim-demux-belgium: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/belgium.jxl -c copy +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-lenna256 +fate-jxl-anim-demux-lenna256: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/lenna-256.jxl -c copy + +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) diff --git a/tests/ref/fate/jxl-anim-demux-belgium b/tests/ref/fate/jxl-anim-demux-belgium new file mode 100644 index 0000000000..b2fe5035ac --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-belgium @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: jpegxl +#dimensions 0: 768x512 +#sar 0: 0/1 +0, 0, 0, 1, 32, 0xa2930a20 diff --git a/tests/ref/fate/jxl-anim-demux-icos4d b/tests/ref/fate/jxl-anim-demux-icos4d new file mode 100644 index 0000000000..eff6ff1f1b --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-icos4d @@ -0,0 +1,6 @@ +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: jpegxl +#dimensions 0: 48x48 +#sar 0: 0/1 +0, 0, 0, 0, 67898, 0x53b6516b diff --git a/tests/ref/fate/jxl-anim-demux-lenna256 b/tests/ref/fate/jxl-anim-demux-lenna256 new file mode 100644 index 0000000000..99233d612a --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-lenna256 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: jpegxl +#dimensions 0: 256x256 +#sar 0: 0/1 +0, 0, 0, 1, 8088, 0xbbfea9bd diff --git a/tests/ref/fate/jxl-anim-demux-newton b/tests/ref/fate/jxl-anim-demux-newton new file mode 100644 index 0000000000..6fcb85c41e --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-newton @@ -0,0 +1,6 @@ +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: jpegxl +#dimensions 0: 128x96 +#sar 0: 0/1 +0, 0, 0, 0, 43376, 0xb2296182