From patchwork Fri Jan 7 09:01:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 33151 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp209874iog; Fri, 7 Jan 2022 01:02:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqIdVGmILqzskQvduq0byOafinvrCF0MflM03WAh4wxN1y3N7DVLETsyeKVeRpcO4jvbHL X-Received: by 2002:a17:906:c156:: with SMTP id dp22mr48011337ejc.283.1641546176644; Fri, 07 Jan 2022 01:02:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641546176; cv=none; d=google.com; s=arc-20160816; b=WGcTsV6oqb6cpCxRcworAo26ZJbStkBj8bpn1K6Sbf86QD+llfGhJRVuH26mWnvq66 wz/ffmLdpfrWZlFQWO7/0XidU4gLlccKJiGVgaCThyMIPXacHYpKOF5GMCHmkCjQAm4M cT6P5N4Dgj6B16fYPvAPwKCpMVNgMuhmZDSxlZzfXjoYyWAjpjQUu75n3fjf6903Acv+ FfBTSWgn/LHNnUarPiGnNctc7GONu3Vu1vNbr1uLWKBUoeHaxemxajVhS0Vuda8jgdCf AigWdyBuz6nJoexnu1bCAjq/tj/LU8WHVdmDjSPOKLiD3ExdZxRo2m9lIFnggbxqyFRR lCNw== 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=PkCkw2VGhc5aSZXoijBD9fUVA9lhNdS/7ty7nc26T4w=; b=jsg3SieK2eJJhCqJGtRTTOelSaU7Rc5Ucm1ka3I1XUUeu0MzM3NupSMmv+pqki4jxZ mVxXsx7MlLy5AWPbFUzFYsp+TpicXHPb4RsB0Kac0OaEYwgOrzG2LQvG2EL/i2ltOl1w otCeYkb9MeVVIN10YRer3W1SiW4yaq9UiOOUTPIQVpgQaOGorJg1G/Dx0Ga3huSut55b pOp02TcdydVre+JRrhB8yxG3Z+nOW72VLOaG3R0KPdIeN80pIorW5rp3jjupD0ch5s45 yPXjZTx0vj6aJgTJadpTU8+ZO6/joySONKiGGz6r21KkyGVNvdY6Wxuj5dkvR/X/dERU d2Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bffd8MtA; 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 q20si2602473edd.566.2022.01.07.01.02.56; Fri, 07 Jan 2022 01:02:56 -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=bffd8MtA; 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 5280168AEC1; Fri, 7 Jan 2022 11:02:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D09E68AAC1 for ; Fri, 7 Jan 2022 11:01:56 +0200 (EET) Received: by mail-qv1-f50.google.com with SMTP id kc16so4943625qvb.3 for ; Fri, 07 Jan 2022 01:01:56 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=NlulufVn30kk4HsEIjKVJ923MgLx0RB+ZVM6qhEn0Zw=; b=bffd8MtAeqa26HNF2qzZmQsNsbXxn8yjV29UXnMdNbYRFR4UYFCd0kAJxD87L113yx 3RoNTPZrnOTDoKMVwcoV1tQjIksOzbX0TSYcaMn/Keg3Iw48BlyWxDqDvb2lAfUl8le1 Q5JFIOkfEHx5Z+uX91q8T9za5KHx7yi8GGuJ8jH9lLjMFXZLHgw0TKGo6nXWJxqPKmOV KtESRMzeG7Qx9ZIzMVU2onSoGQ5gbTxKilaplx5c/ZjrR9y1gkzysPT/eQ/O6Pcpc1R6 WIgzevUkHqC+w9SbMkc181kH/9c4zLqL8vgMQllF0vSwZnVTln31RtPKM7SH1HIxgUwb wCLg== 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=NlulufVn30kk4HsEIjKVJ923MgLx0RB+ZVM6qhEn0Zw=; b=nrsWp4TOR1fg9M1jaNTK5bPjhr0Ctcp0wp3qjU6gme3jkO4lhxbiFzqyPtuzzcpxcP c0GYYU5DijWHsNYoP0AGZZscHPfVWohuCRI8sZA3PDpbKkV32P1C7S2Zgs4tPWG25yoL xcHg2r/8qoV02X9auP0jiYE+q/afgr3VwXFZ8TmathFk5PRMUbDndwR4mIFO4uSl/ulc 0UPhn2kn9JB/adQmLxQusar2eLb7izQMMLw7YMqtbaaiTTSsFuERo0i6C9L/iQF0+azu V4CWfb1FUKIUkaSdJMY9YIKIDlzQMQlq6dJmQGJQkIN4qtmRnCSivuaPgGsXKu9DRQfO 8NAw== X-Gm-Message-State: AOAM531W/dJ1teQ87/Lbk77bO3UyPksjKHDLtiZA8zDyU8dHjCHEytXP QqPOA4Sqlgzc7SiVejvgmKJ4Lv7o+b4= X-Received: by 2002:a05:6214:1c4f:: with SMTP id if15mr56754656qvb.60.1641546115275; Fri, 07 Jan 2022 01:01:55 -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 u17sm3077071qki.2.2022.01.07.01.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 01:01:55 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jan 2022 04:01:11 -0500 Message-Id: <20220107090111.243853-6-leo.izen@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220107090111.243853-1-leo.izen@gmail.com> References: <20220107090111.243853-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: Szwa4F4s85tM 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