From patchwork Wed Mar 30 14:53:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp848431pzb; Wed, 30 Mar 2022 07:55:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxg4q0ZgA4N1jPpg4JG8jJEeRHEEld0+dtb5wTT56zfgbkxF6toirDcdGaMeN1iv/uxvPE+ X-Received: by 2002:a05:6402:5250:b0:419:2902:2833 with SMTP id t16-20020a056402525000b0041929022833mr11057697edd.153.1648652103390; Wed, 30 Mar 2022 07:55:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648652103; cv=none; d=google.com; s=arc-20160816; b=idBw/xCQxkQU0R//zIv0qYN4Qfxw8Km/SNu15VPrdfH7dLlqdhric+KT91nO3AWKGi pv670hDjrbDgmF1AlFgFWvYSm3JY1+FjgXfiXXQk7vIRK2JDKV3Zl1XwQT7W1sBcuxRh 5mAwUmPP6lBQgQ8P/MGA5sUt/hkcrEn3ojnyEd+9AIU+UuaXQyXWHEbbQaqPVGJaIJZz 2cOu23S2yK/m9aTvL6xdtceqbDek4D7is8Wypc3q/GhFA7qD96LmAo9fpSZDtb8x/lT/ x3LpdXOfBlaLrxcGYy9r4cV4qdooMoVgWB5y5tSX4M7liqtcfNZE5V7un6dwME29E0Hv t6VQ== 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=5M6xoVWU3LHSrARqwtlyfEFfkiR8SLTent7SylvoGKA=; b=jpq7yT6caftVrdu/t8wyPeVEqxKZylt0VNZ5NaZhWdcOKbHnnAYgO8eUjpZGcWv0nu b6yqgeRjOlpR9bbXy6juTAdE1Ge2Yvf+3aUov/+RzipE5VOuE8okXHETETBCjhJr0BMN wtYlSuhJDMBkMvGhrtx+nGMSoRLKDLseXHACMiYvfcfCbXC6pbXVkBaryY2bBdRuZeNw b20QW5I2mrXteg2pdOGbx3eQRRyoS9rTDmubdFiP3bfDv+Qn1BPQQxroeDBSBGOqeBNm VSUaUIeMFpPIuqCJFbLSVG01XCCA0ojTb7yIapAwcMA6zHvljUYfupxbeDgJpqFLSRGz QcSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Nyf/UaPQ"; 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 gx7-20020a1709068a4700b006df76385d1bsi19560386ejc.443.2022.03.30.07.55.03; Wed, 30 Mar 2022 07:55:03 -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=20210112 header.b="Nyf/UaPQ"; 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 8448368B292; Wed, 30 Mar 2022 17:54:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 433A768B262 for ; Wed, 30 Mar 2022 17:54:20 +0300 (EEST) Received: by mail-qk1-f182.google.com with SMTP id b189so16760094qkf.11 for ; Wed, 30 Mar 2022 07:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QBkEW2m+j3x8MnVsgyIfblwLAXez1He4Lfx1N2r5GMg=; b=Nyf/UaPQsjYFG3xsioIxiCcR0/ngfR56QPtt0V4HCmZmXyRX+pEPv68aRB0gg2PImU haeLG8pRhm4+ix5iH9UYCMCmx8teYMZc/ICte+v0TYwq/2SE4tamuv929/CUICNKMszi IynHdMcALgURjdaIJ0FLRoy7ERgFpNz1rWdMoFg4KrpJCiMMNsNjkmhCvVWh2lwE8JMB 16p4Mci56TtybFYubpx7ZEEYvIfbf5CwkF2Uwh7IlY7Hgph2eQAAfihkroxwV5rUyA5R PiSfC3x37OWlVH/LjC8DiPrqs30rw1zOqZUK6lT1oy0jg+wr/JO0Ykj7rTD3Uo7XQxAQ C+wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QBkEW2m+j3x8MnVsgyIfblwLAXez1He4Lfx1N2r5GMg=; b=Umh55VBpE53H8bFd1LN3Upx7uSltQwbnZYg0YXNqxHxYPrlJwlpN1mtUWI4fpPvo7s hqvwVmj6ku396Vk2TngB7cAc+yAU4VAx/MSHci82lKmUvOyPHzkk1xMyM5xDGLqhYRj1 JAYeGujNFsCZHrV5RweP/wQ0fqaMi3CRpiMwLTkYtTkZTrNJ6Ec9m73y5LyKbkJMwA0x trn9vXxjInrFnGahRzESdjAY5YjBO7eCWZYdl/qF5Bn/SQty5+V3u+L+da9nyIcrG2zJ HZF/yWjNAx342YjuUIL0seP8XSUn/SXfwP0BFp9tAn2yBWg2EWGPJNMqPPSI7Z5DGeeS 0bXA== X-Gm-Message-State: AOAM531mbhVZemZkcpiKtk/uM/u8lQjIsnyqenfSoenHc9ypuEKXYlGq ardN8B06DcRwMWpsJRhbvJuVgqUhhEI= X-Received: by 2002:a05:620a:4706:b0:67d:a135:c912 with SMTP id bs6-20020a05620a470600b0067da135c912mr5470qkb.344.1648652059068; Wed, 30 Mar 2022 07:54:19 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id e15-20020a05622a110f00b002e1ed105652sm18258650qty.2.2022.03.30.07.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 07:54:18 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Mar 2022 10:53:28 -0400 Message-Id: <20220330145328.52279-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220330145328.52279-1-leo.izen@gmail.com> References: <20220330145328.52279-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 5/5] fate/jpegxl: add Jpeg XL demux and parse FATE test 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: MLGAKWfwynB5 Add a fate test for the Jpeg XL parser in libavcodec and its image2 wrapper inside libavformat. --- tests/fate/image.mak | 10 ++++++++++ tests/ref/fate/jxl-parse-codestream | 6 ++++++ tests/ref/fate/jxl-parse-container | 6 ++++++ 3 files changed, 22 insertions(+) create mode 100644 tests/ref/fate/jxl-parse-codestream create mode 100644 tests/ref/fate/jxl-parse-container diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 573d398915..15b6145c58 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -357,6 +357,16 @@ FATE_JPEGLS-$(call DEMDEC, IMAGE2, JPEGLS) += $(FATE_JPEGLS) FATE_IMAGE += $(FATE_JPEGLS-yes) fate-jpegls: $(FATE_JPEGLS-yes) +FATE_JPEGXL += fate-jxl-parse-codestream +fate-jxl-parse-codestream: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/belgium.jxl -c:v copy + +FATE_JPEGXL += fate-jxl-parse-container +fate-jxl-parse-container: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/lenna-256.jxl -c:v copy + +FATE_JPEGXL-$(call DEMDEC, IMAGE2) += $(FATE_JPEGXL) +FATE_IMAGE += $(FATE_JPEGXL-yes) +fate-jxl: $(FATE_JPEGXL-yes) + FATE_IMAGE-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict fate-pict: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/TRU256.PCT -pix_fmt rgb24 diff --git a/tests/ref/fate/jxl-parse-codestream b/tests/ref/fate/jxl-parse-codestream new file mode 100644 index 0000000000..b2fe5035ac --- /dev/null +++ b/tests/ref/fate/jxl-parse-codestream @@ -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-parse-container b/tests/ref/fate/jxl-parse-container new file mode 100644 index 0000000000..99233d612a --- /dev/null +++ b/tests/ref/fate/jxl-parse-container @@ -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