From patchwork Sat Mar 19 17:26:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 34856 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp380762nkc; Sat, 19 Mar 2022 10:28:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJ2iL3vToMtz24bjTAUkMPTpRjvKAvtR/t1DFbE3F8E7QDoqML0UTqi/kdzI/Eu3sHhKpt X-Received: by 2002:a17:906:4cca:b0:6ce:6a06:bf7 with SMTP id q10-20020a1709064cca00b006ce6a060bf7mr14584778ejt.109.1647710896871; Sat, 19 Mar 2022 10:28:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647710896; cv=none; d=google.com; s=arc-20160816; b=HMH9IJoL6eLtt73IeTIWbA9c4ND8+QOIFRUI60gLirhaq4unxEUEcpzkxISuZEWer1 FLnk/UEDbNRYKRkvIZ9SHOT0Epcin86buxOv1aklL/h+N3d6MSA8t2k7ZI7rZdWYXjLX vKADx/KR8wRPXiUZPLTPGWuvBjlwFV2WQVoQdO4Oo5SMbdPvaxfmSRD9ZwcC5UmVlWC1 RgMQyYPDUZiahCtI0tp4o2htKEmgunTAO498gaGQUbmpF3kwHh/otennh7TDY1FQE765 MTqHX7ArbWpA86sF2nHFLS1krQVpv2U+C7UPFIBuHUzfo4syZCyk9EIF0zJyspbl5wKG OAEg== 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=RxHRlU3TPFC/Uz8ZXduB5FradKk26Yfo4RbZRfYPCU0=; b=y6F6+66DjebUFOEtNRMMEVlO1h8zhStTxKrwZ2O1RuJ1WaVYS8h/Sw9PKmhiRTx47o T37VaK5dj22WMsttfBfwSYz+TmI3btHAYxcg+QhvoJccTwVOHn7S9EQ9tTrXDCtFFAL8 HQ+oVqQNVQjhf6PSIHn0N4uIFCR/GZ0/+6MU3lVfyh0AO6r6tL41BlvXXLw/u01w/yh5 9MDocKagixK9xVYI9KcqIyll3qxepE9yOsn6C+04flPkXwSXkpuTZatxShPJnWBv9eoW 4Dyl6Hth72+ZZUaLDH2LdtTnDN6KvOn++f+hnJIUNe1LUkmoclQCCV0ZP/qPhUAiJzsr 0JQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Hk7Uh5jj; 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 u2-20020a170906068200b006df76385e9dsi3734621ejb.829.2022.03.19.10.28.16; Sat, 19 Mar 2022 10:28:16 -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=Hk7Uh5jj; 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 7118C68B143; Sat, 19 Mar 2022 19:27:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68DD768AF33 for ; Sat, 19 Mar 2022 19:27:27 +0200 (EET) Received: by mail-qt1-f169.google.com with SMTP id n11so9139031qtk.4 for ; Sat, 19 Mar 2022 10:27:27 -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=YWIHPIqAlaHa2G/282qM7RfbNMbHRsD1UVZ12G6SggU=; b=Hk7Uh5jj5giEV9dNKlkDgW9OnBL0OAj0giFz568ZREWzFWaGiBbbSHsFHhbbXj6gEc dQKQQWc3rBKJZ2/QjprEOAQJvoaM1lq1sJ5iV2d8lquSw9CSpTTiKWHqeJGScEMD1GHs FjuFTtTNSk966T1Yb14w+y9Sv6FcWvIenGlNHNeCbqRAYY0KRprMYQrVUpIcPfmRsth2 fiDJxAmThWij4lAnh+29baJO0/2Qxjxw75FhosRMRIzZrvSxRsxA6QRrIOj/mQrwcsDu GmpH6kuM/cFr/OmC0c6LsqVXeA4lhUGkTtJ0jq2JA2U/zkiNnDTE16Y7trNFGBI/HOEJ tgYQ== 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=YWIHPIqAlaHa2G/282qM7RfbNMbHRsD1UVZ12G6SggU=; b=0FcA6uwRNrw3WouCZSK94qVOMzCagtcqk1x1A0wxOoQ4idq2E/v6JIJI23KcLxs5bC TCq8X1bqDs2TdLVadYu2edTwFFxERuqelsFDMxrXPoZflym23JKQWa7O1damtObUs+Gx vt60GtqrmjjVo36GTPrRH810UTPxJo0/zzOzcjVTerjfiF2XpqeX639Tz6KNmd7XZDv/ 1D3ZSKfwCc8s1R0d+s9NvWGMoStIWZ9DN3peYNFVBI+nH6+9TeuXqIgNehRwvVU/pt3k IEYYfdlL1YXTn/Qnmf/xqE3luTKQSyf88PeyxOhUsboTrespLu1Hh5g/XOuu902vZ30R Xhcg== X-Gm-Message-State: AOAM530YSH+rheu6PgruwSLKzwwGTyPGzWak1AJw3WSVPECewCHXJYib dsQCMtcdbBQT4G+VDiZ+kAuM5EC9ta8= X-Received: by 2002:a05:622a:1447:b0:2e1:c405:b05b with SMTP id v7-20020a05622a144700b002e1c405b05bmr11871265qtx.626.1647710846250; Sat, 19 Mar 2022 10:27:26 -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 q28-20020a05620a039c00b006494cbf8f5asm5302402qkm.22.2022.03.19.10.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Mar 2022 10:27:26 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Mar 2022 13:26:45 -0400 Message-Id: <20220319172645.82718-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220319172645.82718-1-leo.izen@gmail.com> References: <20220319172645.82718-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 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: LJFn8oKvELUb 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