From patchwork Sat Jun 24 04:38:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 42290 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp4053817pzb; Fri, 23 Jun 2023 21:39:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5QBnL+w+BNbD2eX/6D8gnr2G5YAEVTzHhixVOKYRITuxfPe4xlToMwQnUIry5DKnJ2CtKP X-Received: by 2002:a17:907:9453:b0:987:47b3:6e34 with SMTP id dl19-20020a170907945300b0098747b36e34mr16796157ejc.67.1687581579203; Fri, 23 Jun 2023 21:39:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687581579; cv=none; d=google.com; s=arc-20160816; b=Z5MmsN/OdxDsMfNih//SZn3h7v+dN8fkPhhmxvNuGvgD3AmOb/1al0YiUPP0is2YNg PvSjnAAHpdVDTQwd/xyg2T8QiUFOZDG9tOy/jTM2O9m8h+0sxeS2XQBMLTwEfMlBWJ6Z Z28E+EWLSmGBXRTQ9VgSvNRG8u2f4ylb4UPtQMoNt7KpkY80V9rpYgqDYjlJuwLr5uCJ 7vbumzOKz1DPDBuh6qpemoQaoxApaAUxC4rRQ8EyWyuoSkwI/xKyntke3HN6B2Evvgd8 aOSipinxcSjNb4/PRC2xJDn1m5gTmh9cDjyxHrBvCksuwVfW2fmD8IOnOb3OHDY0II+K LOCg== 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=P9wzuKWtllUWedxjwsl9Yy5FxcwlGInXFrCqeKUp52190nV2+HW6zuE3Ywbztp0DEd KsZwQla1BkhF7Xga/erLPKiX7kbmEDM9wf/G1B5rGEUi4y0pD9/tgCBAuyu0pT9EEyba mfz0WecvxVZnSk/FHtA3yWAwve1L1Qv14KMpun6ENy4xsP7RehAzln2Nsj8d7wsxAC5u aAyGIaHBBVM0M18cyAfrtImjB0cPWonH1XYGE0IROVJRhxKGMnYJ12kgrHGTXNQ4Fs9Q vegI+wgYXyml9UFOdyuhWY7vLC8QFOfGHXwxyV/4tSqeH29Fnzh73Yx6FWDXJJh4+jBf pOaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=BMOQUg2P; 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 bt24-20020a170906b15800b0098879dbe312si393499ejb.431.2023.06.23.21.39.38; Fri, 23 Jun 2023 21:39:39 -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=BMOQUg2P; 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 B7D4A68C1E8; Sat, 24 Jun 2023 07:39:06 +0300 (EEST) 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 47C3B68C02C for ; Sat, 24 Jun 2023 07:38:59 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-7654ba0c914so22803185a.0 for ; Fri, 23 Jun 2023 21:38:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687581538; x=1690173538; 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=BMOQUg2PSoS7kQtNbTxqS6xYg2varRguqyBYtZL02JPhKaeBeppGq4PPO9jkKjD4lR HvaHE717xZehAk/FSNAIsuTFGDmiPFmR9Kg9m9wKkHk0R8I+xUNkpVO+4FAVBwt1vkGa en7N155Q9oLD4QtXs3SFZ1rfN0+u5dnZuvNEmQUbL7Xg487nytkDh0eIr5T/uS6XlkFf 4bUfTUKK24ykg8LrQxfzQQ0/xlX1Exsn6+E/BJKht/qDxGeyHtAqfAKtE5tUcom1Uice Fy6/I9p0yDU1R4Dm2fak3FO4GT5ZBrD3Ja7gCcHLJDoUs0Qc3QFQHp6vim9021IcoFR8 Diyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687581538; x=1690173538; 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=EyemN0tojP/XqsDREmy4Ux4pOtjji4IpXAA1s5gzt2WaW9xjEF8XC0Fnz31zKBHvcJ Xyd4r2LBzAcOqQsSMmQMxp6PkxLeY8dYFtYz33YKr4SPvQqYqmPipm1tAc7eeoJOrmF+ Z6JGZVhOr8Hk2KbukRDi7SH5ecTADBnVSyAoOq5WOG45VNXVjsLkjm3ZUaBPck8JdUw4 z/riJUs2bY3Xf7lAAC7FGWtnObgaay4XQodnZdA29LqNRag5xjDp8OBkIrp7neqo523x Uaoh+QpD/HddrXerUQ4/N1GQd1+rd9WPwcbAHA1Yh8IlA05adZUEP/vbP7Wxw2va1Jsh LOeQ== X-Gm-Message-State: AC+VfDzugJxTLHysnZ0y8hqasiHMQSCoUYoSE20wW9RbORDRQnSNV7gf FlcoyHFdWiNSDiAWZ/OacoZoRwz7utQ= X-Received: by 2002:a05:620a:4086:b0:765:57dc:7ec6 with SMTP id f6-20020a05620a408600b0076557dc7ec6mr2447260qko.3.1687581537969; Fri, 23 Jun 2023 21:38:57 -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 m11-20020a0dca0b000000b0055aafcef659sm173719ywd.5.2023.06.23.21.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 21:38:57 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Jun 2023 00:38:53 -0400 Message-ID: <20230624043853.12237-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230624043853.12237-1-leo.izen@gmail.com> References: <20230624043853.12237-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: HgmMsnYO0oaA 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