From patchwork Tue Jan 4 16:26:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 33067 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp17131873iog; Tue, 4 Jan 2022 08:29:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvxwY64cg4WvziLM1BGKPIpR3DG/TPjVva0aBQL0i0ZiIhE3DLr2zcPx5ARFxw8osY8q9O X-Received: by 2002:a17:906:5d01:: with SMTP id g1mr39704910ejt.219.1641313769034; Tue, 04 Jan 2022 08:29:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641313769; cv=none; d=google.com; s=arc-20160816; b=uRfw2rhLGUAYoOVQJeV1Z/n3/2H2EQrAGEiGt+PAnhCZmzr0JlkHTtnWjQTmw6qCWc TZL+v9k/bE7O+OzebXYOQPvGIxOJaJTEPccsUvhVarFjbtX84OWroQw30WLK2QDyO7Dm 2fuwagfU96ZnIYDze0ToTNxhyvAOc7tWlH9WPFOu7/LWpsCebeFWh3UU2B+olaqioZIp LBLMIatgHp8nfr3fX5gzHRfj2jt9X6llLcYLlAkWGWMyrFy1k6JzTVjmDAsAn7ar8hdy Xx8u7meLQkrkXcwHf+/QfP/r9gJhvXOLnT2JAAyv8fh84fTxZGJ2hQakRCM1iG3xCMBS hHtw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=PkCkw2VGhc5aSZXoijBD9fUVA9lhNdS/7ty7nc26T4w=; b=iRg/DN+0LaIw1kRyhSCC38d96aQPv//kLPZO2TjS88SRyTsfq9ckOYh+ut2Yxu1b/e RHWCJ3/f939FDXpTnGXe2o3VBpcIOOPCOAb9F+jmW0ZOQ6JjTuYZUmKjZTyO0atMVswl f2MGirdmlaXqGfylT+KzJASWvVXizK22v719PxPuzaP6MYmoTPuckMY3Eo7kqXmn6Fny u4jdKTzjQMkKh55yRyD5dpEMRprO9Wukc1GuIPXhi4xLKnj1UjRFd2y8PyyyOGU1tyEn k66fDGlL0GV8EXrlH2BtAUDyTKPSuSowINOQPD59PesIZzci14I6GYZxDEfbtRdUzYgc 9XIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dbhpRi2l; 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 hb12si18441394ejc.650.2022.01.04.08.29.28; Tue, 04 Jan 2022 08:29:29 -0800 (PST) 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=dbhpRi2l; 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 0C58268B2CD; Tue, 4 Jan 2022 18:28:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B57BD68B2B5 for ; Tue, 4 Jan 2022 18:28:50 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id kj16so34820811qvb.2 for ; Tue, 04 Jan 2022 08:28:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NlulufVn30kk4HsEIjKVJ923MgLx0RB+ZVM6qhEn0Zw=; b=dbhpRi2l3oRLQ7CO/6M0TefBOKsyaMaFkG1oEje0yEd8w0z0pGRnKsxR9cFfMlP4lq TUZIQgOyz42UXiXvnW6G7hSBX9+ymr9G8dQqr9SkYYoHb6U/2MUyIKQPL4m5QEDwHDbF 0CfJ09Q8IUUydRsC3GmsK+EjyqRtITzYH6skdROjyN9BlC9/agYB9U8i7C0mV0C4U+zx cIGTzT27NRe2LNH2bhrEWzQ5vjOa8/oWMg8V8PuKEwL7/pxbrtG+3PcrYG4gns0wclR0 6bFJpmTGLDGijX+YZxYQIyr4x/J1pbveWPaCp+PjHYvTzJ1Nq8aFjw9EFl5Pt0CEWBP0 3KrA== 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:mime-version :content-transfer-encoding; bh=NlulufVn30kk4HsEIjKVJ923MgLx0RB+ZVM6qhEn0Zw=; b=zj3FAsJhMdw3b2OHLgEYS6KEW/tTW164tpWfdtzk/1ZN0szqYYOyPy/afxEyWAKhus MLhHOTkybaKcmC5SSRL7Cb6JsoQKntkP3qkkFOsBY7jE0rNsqal9gc3i/EzfEtk1xIqI J+JpoiwpTFHUDuQvM9GK3z6XYseSxbeTVhGAcLDrimEdl4MQvHNaSfIUrm1Cys8YGgNL Vb5ezK7HCHXSRkfDjYYdGqERlKtkq1wUYV/xoFkmtdA0d8qzPPGChJDnZNhxalpAzL1d dYKwvYEVnqweoLSQlq/lAw4v7fGTjSXq/lxp1D3lkQIDyEaye3Kk8k0Tcuc5liOIuFyd M66w== X-Gm-Message-State: AOAM530SvqcehEL8pUOIw+24DbrPrPQY85/p6cm215yuVjG2kYz35s2W lb9Bx5zcB8EovgAm5nolqGeTMMVQup4= X-Received: by 2002:a05:6214:29c1:: with SMTP id gh1mr45879737qvb.108.1641313729479; Tue, 04 Jan 2022 08:28:49 -0800 (PST) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id v5sm32623567qkp.126.2022.01.04.08.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 08:28:49 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jan 2022 11:26:32 -0500 Message-Id: <20220104162632.52767-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: 8PJlP/d+laSG 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