From patchwork Wed Jun 21 18:35:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 42270 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp2333756pzb; Wed, 21 Jun 2023 11:35:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ60i/tFfPdJ5xEC4EamcpQ3x5PBrPrCKC16cyq0PzVdYJQ7MEXOVnCNClCBUySnojvUvlNk X-Received: by 2002:a17:907:e86:b0:988:9b29:564a with SMTP id ho6-20020a1709070e8600b009889b29564amr9220884ejc.68.1687372539733; Wed, 21 Jun 2023 11:35:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687372539; cv=none; d=google.com; s=arc-20160816; b=Quu5Xto+Oo32AcSNL3rQ70LH686NtZy9Ptq+SErgCg3H6jrYGNmnosAU5tqTbQLOq6 M3p0MprXOgE4G9AGLBOwunqGPd9gKlpkZxX2j+MG+5P61LI7fZJ+3waNiBf0aVGv55cp U7Imq4/7xxbKxGiyM9FDcKuQCsAXQnVJiLofefkZP7uRPOqfFjurAj57/iIMAL53M1XA 5DhQBR9a71LzkaZqpDGF8mSqkgCB0E1SFVjNmaX6epKfXzyYWZQxniOVIFg6gunaL+QV Ify/1lFX9OaHIVxidnffBe5Zu4u+pFIuaYiwpksVIRBjGqJ679DYV5LLEKxovFu5bfO/ up/g== 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=NMiIbbQub+JWsHPXCsx//priLRdt8Acr9wWWEcT+6lQ=; b=EwOcxRtBPXKexEauel6kWYjQLHJFLBZ79tvvI+/KfCnRCWRd3eq4jsd90dtdtcJu4S 1HGyFwP5JepIfgHeb1nFqk14ZVIu9tCajG0MdqtuNuu+qDVA5tl1Hfn2Cn4bXQl0yXIt m9Plw/uBz0gWO9HDGTtVzRQGzFh32htzLRWzl0X+gXemQOj8NkIFQdFla7v1srzKYFiw 2jUooy+XY1qU+a7qagQ4uLm8YymLAUR90CLznzGJz+3PWwxeoJbwUmZmaKi1w4ssN/9m mlS54dWwdVPyYvy6YVS2orOkaEKhB6IStDN12GCVUmbANTj+kdwegClmFOUZivTWx6U4 o0rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="fA/qgD1k"; 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 y27-20020a17090629db00b00988635d7017si86247eje.907.2023.06.21.11.35.39; Wed, 21 Jun 2023 11:35: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="fA/qgD1k"; 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 9A59668C165; Wed, 21 Jun 2023 21:35:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F05A968BED6 for ; Wed, 21 Jun 2023 21:35:21 +0300 (EEST) Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-556f2c24a28so3905167b3.1 for ; Wed, 21 Jun 2023 11:35:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687372520; x=1689964520; 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=SDnwZV/vQOYAXrTVgGthLKHXsvsIFR6lsKSgbZJR8LE=; b=fA/qgD1kYRcKo8iT1fQNfZQy03Exbt3ZuOlJJFK89d4h3Z36niNVVRmzM+Oy1OWspV 0Hgz5Ld54A8q/w75+ieo9MMnu76mTXZ0fxAw1CTpZMDlzCi4i/x+btLfFzciMXCiQIsL DIgk/Dt1k9ad6YjJl9+Zs4cLDFqUC2dEeKCHD0fnaWymobBtAl6+sP1QbY5ynxC7zasn x2TepDcvLRsKe6/OS8VbbdfDhBoYlmaDXbR3Roqq7G08G4w9uHJ1nA8E55K9X5wO0O05 ZapC1CcuyH3sTzO+o101us6/1tkpCuCPjy/aB+D8haMYBxDJUcObItrQqzFB3umVGfhk yQZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687372520; x=1689964520; 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=SDnwZV/vQOYAXrTVgGthLKHXsvsIFR6lsKSgbZJR8LE=; b=bBdvZfTmvVib2u2dgU7kLUhghp2VBvVqkkfm6W3EVmwOLGMUe3NzsUu2B5f4Kwf6Mm gTwtV862n+sWPCM133GzK/YpxjJEnyaAdx67XkL5sjYxYaFyZLQF3nNtScEqDam3ouKX 4Ck+kS5qFYSH3OrW7+KqCoAkXxgls92tNFq2x6ZcfmBHnNAiZjzwVFrtTVhLqnioYj2H SwSIbChcSj1YubAoRPtU4UUp4swE+lvLeXaFmcRcao6Qc+wVFuWm4F+6ut+fBiRzJehH aVxeKin5G9I4D+cujCLtIqubm9ugIbcpvU0MovG51xg5RLEuI+F+3CJZp8Q+ZdN46Ey4 8OzA== X-Gm-Message-State: AC+VfDwEUJCzJn0QqjMdlQeocAT2dRQEvq0UIhbbCKvY/taiMDNAoA8E +zq3Ky6GtR4KWmICArgsqhScVekNmSc= X-Received: by 2002:a81:1a10:0:b0:565:5228:44f7 with SMTP id a16-20020a811a10000000b00565522844f7mr8667837ywa.4.1687372520489; Wed, 21 Jun 2023 11:35:20 -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 n205-20020a0dcbd6000000b0057064c14d14sm1299810ywd.11.2023.06.21.11.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 11:35:20 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Jun 2023 14:35:18 -0400 Message-ID: <20230621183518.1281996-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230621183518.1281996-1-leo.izen@gmail.com> References: <20230621183518.1281996-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] 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: JywMkqshtvAK 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. At the time of writing this patch, there's no internal decoder or parser, so the packets have to be shown without referencing anything relating to video properties (e.g. width/height). Because of this, the framecrc and ffprobe_demux fate tests will not work, as the output will different depending on whether the --enable-libjxl flag was enabled at compile-time or not. probefmt -show_packets was used instead as this will avoid running the decoder, if present. --- tests/Makefile | 1 + tests/fate/jxl.mak | 16 ++++++++++++++++ tests/ref/fate/jxl-anim-demux-belgium | 12 ++++++++++++ tests/ref/fate/jxl-anim-demux-icos4d | 12 ++++++++++++ tests/ref/fate/jxl-anim-demux-lenna256 | 12 ++++++++++++ tests/ref/fate/jxl-anim-demux-newton | 12 ++++++++++++ 6 files changed, 65 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..0451428046 --- /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 = probefmt $(TARGET_SAMPLES)/jxl/newton.jxl -show_packets +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-icos4d +fate-jxl-anim-demux-icos4d: CMD = probefmt $(TARGET_SAMPLES)/jxl/icos4d.jxl -show_packets + +# 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 = probefmt $(TARGET_SAMPLES)/jxl/belgium.jxl -show_packets +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-lenna256 +fate-jxl-anim-demux-lenna256: CMD = probefmt $(TARGET_SAMPLES)/jxl/lenna-256.jxl -show_packets + +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..2c686db107 --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-belgium @@ -0,0 +1,12 @@ +video +0 +0 +0.000000 +0 +0.000000 +1 +0.040000 +32 +0 +K__ +jpegxl_pipe diff --git a/tests/ref/fate/jxl-anim-demux-icos4d b/tests/ref/fate/jxl-anim-demux-icos4d new file mode 100644 index 0000000000..84aa6e5849 --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-icos4d @@ -0,0 +1,12 @@ +video +0 +N/A +N/A +N/A +N/A +N/A +N/A +67898 +N/A +K__ +jpegxl_anim diff --git a/tests/ref/fate/jxl-anim-demux-lenna256 b/tests/ref/fate/jxl-anim-demux-lenna256 new file mode 100644 index 0000000000..c26be90185 --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-lenna256 @@ -0,0 +1,12 @@ +video +0 +0 +0.000000 +0 +0.000000 +1 +0.040000 +8088 +0 +K__ +jpegxl_pipe diff --git a/tests/ref/fate/jxl-anim-demux-newton b/tests/ref/fate/jxl-anim-demux-newton new file mode 100644 index 0000000000..537e8b567f --- /dev/null +++ b/tests/ref/fate/jxl-anim-demux-newton @@ -0,0 +1,12 @@ +video +0 +N/A +N/A +N/A +N/A +N/A +N/A +43376 +N/A +K__ +jpegxl_anim