From patchwork Wed Mar 23 11:03:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 34931 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp859838uaj; Wed, 23 Mar 2022 04:04:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx++m62Hg5Ml9Tqgi24lbn8I74GAKCbwpOw35v9lJc/+6by+AkkKMXDH/VB+og/sXvFgIs2 X-Received: by 2002:a17:906:7c93:b0:6cd:341a:a1d5 with SMTP id w19-20020a1709067c9300b006cd341aa1d5mr30063288ejo.698.1648033488782; Wed, 23 Mar 2022 04:04:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648033488; cv=none; d=google.com; s=arc-20160816; b=wkhJaLmUKNmM9LGN3whD6WtP8iQpwNFKseTUuT+FhMRGxS0oFhT9MMBOe6PhYlzV0k Ndi+iVdCaflGSBB3b3gxKCQBX93pELPI3DDkJA+38KCOuEuG++5Kt45F10meuKR9ai6P 85yn3BGXN9VPVMlHFFHZaBgd9/bgMxpSxQaFrRp85WNO5zKKzaDSQnbPGR/MYUOE2Phr E687uhJ3PH7y+x0dcCEAgDJ2xNivAgjnAcZkmtDB+RpdX937839YJ2HN7Kc5sFsZwMjm uCjgUpcGOHRJho00LTwzXxhG9OnAU0IyNDMWL8F4fF/tMnH/qiJrLt3s35KRT20cyAPn 1vHQ== 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=N50qDzaDTQJ/hH48di8+x56CruJQsUT+rxnJsQ2p+zLqUIudWzmv2ifljaMfYNkKOG c3osPse3OPKF2daSd0SEQPD314rm+CUr4ctM//ra+KtCBZibqwigXwab46q+6nway+1G XbU0mp5Xzh4TPFD+FOxW0r5JPWMfZxQT+0UubSVOeXSRjot7iVKFB4izQ/B5cyunUpb1 +l62x70hJAbMlYSmVgkm+XSKVpNgCYaAIM0YnLM1cQ16I4PcY9vVCGTIsH+tSFy4ygG4 uqYU9hFGfewKUMe9TmkWu/VSY4hKvGZirhb6MFNfdOkuEFW7eeVGobmgge7KHQz7yWFa 4fdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=L+lDXbq9; 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 ky19-20020a170907779300b006df76385ea9si11675907ejc.841.2022.03.23.04.04.48; Wed, 23 Mar 2022 04:04:48 -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=L+lDXbq9; 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 2BC0868B1EB; Wed, 23 Mar 2022 13:04:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C32F068B1C1 for ; Wed, 23 Mar 2022 13:04:02 +0200 (EET) Received: by mail-qv1-f45.google.com with SMTP id kk12so882115qvb.13 for ; Wed, 23 Mar 2022 04:04:02 -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=L+lDXbq9OdL9iWZAFbeLjgLd2Bhc7hJe/362t9XzjcmQFd3z0Zwavl/P4nxcfGPM1Z Jd2MQRjQQcGUVks7paupFYVjjZljILOlomC+NQ+M/wEhMyytRaIhjKe1x+qbIAICsUOe 0CQbOGIwRaYmjlkgYRTWbyhxRtS5bfgGehMcp8zpimFo9WDA1H7ZPa4sqPxKEchXElPU tO7wIA3Ju4kz6K17sTlx9AyqbuKAq4AweFpTxA5+zbz6hxB+kJFwsoy5AJ/l2O0A7DK1 IvxUo9iS51edUFPD958U/e+7ZJ9Hp9Vy0z0k/nYcgmf0QorP1IdBskhDvIJFClxSpd0b O39A== 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=NJXKoL/v6MyJ1YERvcMZwFXpB913+yTXpGdZWYzcLCNNdAu8One4nTVr1+eyDWHsme 9ovNpPwFvj0olqMIDaqvEpTqDAWDgAAi6IKUckrP+h2Tz/thxugjTt+MgYsuFztqI03r CW53snHDteu/h8kARCrSMwvqiv1+Ym81zfGw7C0VES7kIZzqYcdEq73bdvI8FikQ8ZVa 44wfU91peFdcUjlatszh4baTeTgvoKcriC9+0Z98JHlnNvcSzh/pDwA8gUfvJbBVb7TI hIkDJXWvdI5ciQM0D2M/up4CDQWqq1/rKUJHhrvw32qXuGUk2458LwIGR+Esuw6tt6fr psdA== X-Gm-Message-State: AOAM531RaKFIqikSc1zCjXr2sp8h0caNcljOkEo9WQQRvvf8WCDiEOE0 5LSahN7DXZXBO/ZW2UdUJ3R/FUH1s8w= X-Received: by 2002:a05:6214:4017:b0:441:35e:fcbd with SMTP id kd23-20020a056214401700b00441035efcbdmr17135825qvb.110.1648033441529; Wed, 23 Mar 2022 04:04:01 -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 s13-20020a05620a0bcd00b0067afe7dd3ffsm11012061qki.49.2022.03.23.04.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 04:04:01 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Mar 2022 07:03:25 -0400 Message-Id: <20220323110325.5499-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323110325.5499-1-leo.izen@gmail.com> References: <20220323110325.5499-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: kgn66wpJvZLi 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