From patchwork Mon Jun 26 15:49:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 42301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3805:b0:126:ac68:d900 with SMTP id p5csp1266487pzf; Mon, 26 Jun 2023 08:50:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7HNfMWwhLRyLb235PwcfwzF+pI8+Ik6HN1TCA5g8YsBEx/lg/lWCQGlpRGNypU7pKQ2LE8 X-Received: by 2002:aa7:c94e:0:b0:51b:e9e8:164b with SMTP id h14-20020aa7c94e000000b0051be9e8164bmr7517700edt.35.1687794619884; Mon, 26 Jun 2023 08:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687794619; cv=none; d=google.com; s=arc-20160816; b=cRu2UDmHxOzs9BoClG2vfRS5jvOHoRjn3A694e+oIom4QU2OdtVK6QbLsjxd7Zz/AP yLABhzMmfLM5Hc1ymd/ZdrHbG1Dste335k3izwAEyuUb5x6qpB20I/vqOq51kfe9o5O/ twQoYV2zoCciRp8mmnxDQNqrunZEHEtTKljE8u8XRKi/kBN7faWsUrAKB6RbGswcy+GB zmx0BmTReqM78j2D3KJSmivbvWKm/PF/5bspU5Kg/H88HnLcZt/8poMRXLZmS4H02UW8 oHxhYrh6vO84ZVUDxzso7Ap6xXTsVGWX5h4HhnHpoACZKTvGxcgakPUHpiCHhX/KXA/K LFTw== 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=hh/3nPhmIwsxdWN3zcl4QCn72x1EOFQ8MQo0rd6sfLM=; fh=+bdjGe20eEUjtjncwA1dnEEVYNfJL4vyhV+sIRR4l+g=; b=GBnwhnD0VEun2s4hU6PK4ZpZiFLCFwUVWg5RO/86qEwVsuyXRpLeMjK/qQq9kqP4ws 0H1vjuC07wO0Q2f5tR1Yfsv4mcJ98soJT9XFJVJSwjQtGZzO3H7GWJGWpQKzfEWvgSwc FhfCPK9a9jlkH0DC8EwiPIIpDUYWPETN7sZuWQ00Dw2UoxUrJcDSi/Rm1hdCbYTVyF8I aDZWrDDRNHSWSVxwROL3RVAhdSRUAr2K+5tOokTKBRmwjmR01FSJGwWkP5BSZ5wNNEtM sd4E8ZtWg6CoWCUkuNhZ5AxSjDDfdWpYuZQjTyTVV/rYisGfVFmwC/6kyC4aCH42ewHq V+1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="i/8mL9J1"; 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 r9-20020a056402034900b0051da02e98dasi705105edw.242.2023.06.26.08.50.19; Mon, 26 Jun 2023 08:50:19 -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="i/8mL9J1"; 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 5D7E668C2E9; Mon, 26 Jun 2023 18:49:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C6E468C2FB for ; Mon, 26 Jun 2023 18:49:29 +0300 (EEST) Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-1aa25c5cf0eso922757fac.1 for ; Mon, 26 Jun 2023 08:49:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687794567; x=1690386567; 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=7t9rrIe1f8nURz3Y2dGVNkj+qFCb/9hTfOC8G2hZ99E=; b=i/8mL9J1+bFwty7CilV5JS5jQ8CrOOH6MAIhHrZeNgYT4Rt0PUkxwR3izLis2+w9+9 TNvf5EQNR7HL0sO1zuLRKcvzTno4MGpq8PnCMzl0mqoFmMaeD/VRvnEbefvEQ98veGjh PPNeFh7o+A0nwHEcyZt7x+7I72oD80z8WK35Cl9JhQ4DE2FZtCNwx9mvKCPkkFPve4TI wvalLz/ljV8pnq6nxonCAbxuQ45iqatuD8FeMANJlqZJA4NuYjwc6ljK/TB/qK5O6oOv KtqvDCyRyHgn24/UEq6Yt1PfeHHh7wGTZXGnQifw3VQ13Xm44kzvOjN0M1Hch3feouLG PCkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687794567; x=1690386567; 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=7t9rrIe1f8nURz3Y2dGVNkj+qFCb/9hTfOC8G2hZ99E=; b=eeMLHHveC320BFn9pn4ylG+dx+XzMRGmwnscMrgaR/wb3DoGfsLKQCgiSmxGpZ//5u iGlc/iw++gqGb+VErlCo/xnmtsQryLpeCTPR3AOldglRERnj8VzYWPXeeXWg3lb9eca8 1wDtfHzvNmOCK/r/ufVxwFEE3KYX6PkIBpWwClCKEY1U0JB7XgNM/oazeQGLn05d33Y0 U7P8Jwlj9H/ksbe702G98qkqoDlCU3T2AgcARhorpXx9fpAIYSQM2bK6w104REEtGbhb d2sPBdcXHnbcxeaW6ZSL2E/DXT/5VtK2S4T8w6NoXEwo/UGqC9PSt1gSPuK8qcgJSxn2 9Lhw== X-Gm-Message-State: AC+VfDyXEP6ZCrURQvf8cwtu7boUHufF9bET0vtdfm4XcMEB2KwHkYsG wO7BpLrkaJ5yN/mPP4E+5Z5Sv/k32IE= X-Received: by 2002:a05:6870:6594:b0:1b0:33b6:c2fe with SMTP id fp20-20020a056870659400b001b033b6c2femr2460549oab.0.1687794567510; Mon, 26 Jun 2023 08:49:27 -0700 (PDT) Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id r206-20020a0de8d7000000b0057060bb2874sm1359724ywe.37.2023.06.26.08.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 08:49:27 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Jun 2023 11:49:22 -0400 Message-ID: <20230626154922.66550-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230626154922.66550-1-leo.izen@gmail.com> References: <20230626154922.66550-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 4/4] 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: 4aFHaSBy/m9E 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: --- 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 | 7 +++++++ tests/ref/fate/jxl-anim-demux-newton | 6 ++++++ 6 files changed, 42 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..0bd286a451 --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-lenna256 @@ -0,0 +1,7 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: jpegxl +#dimensions 0: 256x256 +#sar 0: 0/1 +0, 0, 0, 1, 4096, 0x2409e9e3 +0, 1, 1, 1, 3992, 0x966dbfcb 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