From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3364546956 for ; Tue, 27 Jun 2023 23:25:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5879868C37B; Wed, 28 Jun 2023 02:25:35 +0300 (EEST) Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5854568BF08 for ; Wed, 28 Jun 2023 02:25:29 +0300 (EEST) Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6b74e2d8c98so2311431a34.2 for ; Tue, 27 Jun 2023 16:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687908327; x=1690500327; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=8jCr1bm4UzQZaUErYI93Rotoky/VGvj9cj44QsMf1Xo=; b=qPAQvMjz2pSUuclOzhrO0LHzZiWsAPUivd89FECybu5yNEs2V9yr5CADKIsaUDVt1F Ac4iZ+0kj84ue3sxb9mdwU4y0022xqYxQVOORlF+iQeFlVgTn1rpqSDh55HsG9pp00Nc H+Hlp69Mmx710vgARvrUcggrBfA/Bf2LN89HLFUSWrrA3itqkiIFbTTyvgXi4oVPn2ZK cnrK7wmWZjIQr/BrTkFjFyb4uSVrMiOX3kxsTk7/Urt031zFJwhzSTyRRG58oV237Ngm 0q/FZ4WiAq9YS0QVSqMdAUxEK28RJa48Khzc/OBlN+80RM0BRHTmBPR/C1/C54koNS2C 9sbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687908328; x=1690500328; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8jCr1bm4UzQZaUErYI93Rotoky/VGvj9cj44QsMf1Xo=; b=a7XrRfV+SslP1jKnaL0gKEI69LC67S4AwEw1EgrgF7Gh62xNjbuubWxz6RadjE+qu+ k79+ckFpl1H687FUiuYrGQ+oIum1NEdZr/TUsd0hxxUxyXIh+n2shzvs6tlTj1Vv6QAS rgbunFxx3KqMr9+RRajr6F/OmLZuRAl/xobALcsksfpFte5rS6TNMFPDszPpRDHQ41Jf pMTGkjl8xga6FNTOQiZbyYqBUMOhedAXfkKwEQDnURE2T/QOYblRFSlTAEGDF2uPal14 tesTBBzk+WNu2xbCqDzc68+YJC4OtIR66O5t2Jpyzkq8H0MbFOzoRQiqmyuSao+dJTIn tzdw== X-Gm-Message-State: AC+VfDwu5z+lVMnzaVIRpKu4pQOqzECq5CyJy0vtUzfYY9eBwcyivPRp +CUA57UXqMkQDxenQbnjL+f8EAKRXD8= X-Google-Smtp-Source: ACHHUZ5IiScrjVT+LcHdcWrwBvsGGb9hh2X/1+9me1EKk1jZwhKf2SG29t9bJCLkHeODNzxSvSShtA== X-Received: by 2002:a9d:4f17:0:b0:6b7:378d:7da1 with SMTP id d23-20020a9d4f17000000b006b7378d7da1mr9762760otl.19.1687908327734; Tue, 27 Jun 2023 16:25:27 -0700 (PDT) Received: from [192.168.0.12] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id bt23-20020a05683039d700b006b29a73efb5sm4127065otb.7.2023.06.27.16.25.26 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 Jun 2023 16:25:27 -0700 (PDT) Message-ID: <4be8b6e4-9829-ad1e-726f-0e459203f313@gmail.com> Date: Tue, 27 Jun 2023 20:25:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230626154922.66550-1-leo.izen@gmail.com> <20230626154922.66550-5-leo.izen@gmail.com> From: James Almer In-Reply-To: <20230626154922.66550-5-leo.izen@gmail.com> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 6/26/2023 12:49 PM, Leo Izen wrote: > 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 What this tells me is that the parser needs to do bitstream assembly after all. Image2 should not propagate a single image split in two packets like this, at the arbitrary limit of 4kb. Since this format seems to have actual delimiters (FF_JPEGXL_CODESTREAM_SIGNATURE_LE and FF_JPEGXL_CONTAINER_SIGNATURE_LE) and even buffer bytes with ff_jpegxl_collect_codestream_header(), you should then do the assembly in the parser, much like it's done for bmp, jpg and many other image formats. The anim demuxer can remain as PARSE_HEADERS so it doesn't run the frame assembly code. > 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 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".