From patchwork Thu Jun 22 00:43:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 42277 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp2509562pzb; Wed, 21 Jun 2023 17:43:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71jaMHplRJDt9d6rEKFokynFd7BkggCJKAwqfd1mBS6SUUTiVzTN73/WBq2Kk/HODnIxv/ X-Received: by 2002:aa7:c6d9:0:b0:51a:3850:e846 with SMTP id b25-20020aa7c6d9000000b0051a3850e846mr9668233eds.7.1687394635125; Wed, 21 Jun 2023 17:43:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687394635; cv=none; d=google.com; s=arc-20160816; b=v1RnpGx3xRJKgNmyLUN2zlJiW2IilKhx84AAvHBLPIznQKOsdmOnNMxpv7fcs80MF/ AnNLVapZcF5moahI6V6yF06SCA1BHgMlRaj9IJm59Wr6yN2HBrT26MAej06jmBmDKCjA iCwlWSF6R/AqaHoXX97NXS83RkY+WW4T28hDTQtCDNjLMmgBeacd6tklC5UN7RKYqovY RVZ8HyQc3DiAI9rWgw5PR6d6FD4l1nAtFSrk84sxHWJtLHCcvFqs7FloSgdcz5ugDH/f AAgfnnaOFdxu0zFg6PJjSAabj0SM6343nX8M5fOj9C6NUARbd+7/XzeFjp4NNbtwwVGe z58Q== 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=Z73DZj3bxHqKMlhyohszWuIxZZBCQgi3WB4Q/GpIy30=; b=VLFGmosCbv5lpUSEDkabb7jgAXFfVR7W4goAqn1durMKyGKMst3u6vpBl0lRFWeKRF KTbQfha3Fr0gyJEMJ6hW0ixYRbO8gWNjuS1ADKmC/Ymss2CABmPITm69Oo4epP1Ltqhn CxV4V72VlNzjfeEpG8x6mOr6OtRdkvMURBSe+tjcozvp6zL18pimCGVqfeOeUAC8/Qnz cT4EfTPJDm75r+mRavTU9iM/RcyjI9tDy1A1KNQt35aXz+Rs6wz/DfmN5BLL7TwIXnSf l9Z63Dj6kzmwtV1YoeV8W9ot5IvynIh0HSebeJDFeakl+IObhWXA3Y5IbuGhsCvLMVDm G9Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=LXxsMPMl; 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 i10-20020a50fc0a000000b00519df1f95f5si742763edr.246.2023.06.21.17.43.54; Wed, 21 Jun 2023 17:43:55 -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=LXxsMPMl; 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 7B0D068C195; Thu, 22 Jun 2023 03:43:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7FC968C101 for ; Thu, 22 Jun 2023 03:43:19 +0300 (EEST) Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-39c76b2917bso735557b6e.0 for ; Wed, 21 Jun 2023 17:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687394598; x=1689986598; 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=isHJKGLL3TbEkQbQYCjzRsfAm8uDmzVrz6tlC6dfeOE=; b=LXxsMPMldAPJrmSGEPTYKeObdRk8QQ/0YEgjSQnZwVHnzPhtDkTNOwdjWq54gqM6JD YzoDaM6R46pkVKs1QQwMFeDW+zJ7Yf7h5e3lGL2liGm4iY/4ShwSPA+YplUcHNPFKYmz QEDi+aIJnqHWD1CcJQl9wAqB0+0fhk79j5nMQBnTYBaVW9tNw8+ZjaHXJiEX6oHdrtwN OlOiXZyB+zieRxzh+JvEAU9kqLYjRs6aFYRiNxDj6ESZqn7Whe2xsXnKyRTLZ2ECP6x8 9VYQAJqDgdGdyYdd09G9X9MOSuxgJ8CoCynW2maBIXZRaSIHZOqCMIU4351UkgZrAycP 2D9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687394598; x=1689986598; 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=isHJKGLL3TbEkQbQYCjzRsfAm8uDmzVrz6tlC6dfeOE=; b=Y4j8Xdp9rvgNzx/eaT+g1E6WM1a5fB2swcNOgLK9FJiox3nYYmamRZzZ+g7pvWMRjt A34dpKArBCR3LfvM20rgyQz0s3cBsHujinjsB5v7fAcv9hpjoRMqvtJZAf5S2JrLSb8F tbxaDp/FEY3GphL1yCvO1tF++PKJyicfDqM1tEdY7qAURgzQ05bo2oMcB5ns2HFFn3kA BKBEyur3YZQadThQlLSVhx3bTgHaWtTjOdvZdqV+RkBdZp1woj02tGtiwjCLHSNqvunp oMMHjVTZWC0yUptytkNnNF4Pqt8IOkNquHSzmwKSDLgbgihp6r9G1oA6VS/AzTpw/k7L LKRA== X-Gm-Message-State: AC+VfDwE2S6rA+zHXi40yH2dmvzuMtHzYJYZUguHdfNOO51yBbfEwg0S pig1BI6yEt7k73Psh3jurfY96GAjb38= X-Received: by 2002:a05:6358:e908:b0:125:898a:7505 with SMTP id gk8-20020a056358e90800b00125898a7505mr8802513rwb.2.1687394597997; Wed, 21 Jun 2023 17:43:17 -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 e9-20020a816909000000b0054bfc94a10dsm1476026ywc.47.2023.06.21.17.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 17:43:17 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Jun 2023 20:43:13 -0400 Message-ID: <20230622004313.69697-4-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230622004313.69697-1-leo.izen@gmail.com> References: <20230622004313.69697-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] 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: ET8cODfuxSP0 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 | 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