From patchwork Fri Apr 1 00:20:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35122 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp376023pzb; Thu, 31 Mar 2022 17:21:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy294K0sW0WUXmpKr2nWm48I3hl5FhD8XC0FjPo6pJG73LiZHy/hYGtUrDlM79JyEsfj635 X-Received: by 2002:a05:6402:3452:b0:418:f963:42a3 with SMTP id l18-20020a056402345200b00418f96342a3mr19013342edc.12.1648772478777; Thu, 31 Mar 2022 17:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648772478; cv=none; d=google.com; s=arc-20160816; b=TWgeTg3gNBZR5KWJe1dqJzpF5iIb9EIU+1ay01wgGYea3Z14fJy4T2lsnpiq4tttYm Vdm9vG+0YHBLnPm6NzyxDDFP1vFddArF+adY7cSJJ6pL6DdHFjugpzjIo9X0w9Q8VwyB spZ2Cat5+LeXO5a9AMHGiePbQJMpzFaMZ2U+k+4lVGz0sG7e6wqIojtsTxUKmmKsyMcv st7BUkZRh2xXsyjgOw0pWjhpmgAEFpE/J3uGd4/Qw/Zntfnf3NP0tqR45r52mzyoJ5x0 WHM+TyODaiMom/7tsIgaXSKNMlKK7IVZKS2yRrRzJXK5MYBgx05XCjDG9D2VTl+dTtDf 9IcA== 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=eDKzQJmebxASejSn0aoqwQ3YNeNgw9uQvxeP+HoFQhUGEi3w0Cpf9Q0/danAiQx68h eSoIbzq5B3Rt7z16jp7wUZqxVM9EfXzIkmpRwfS3gQj90tDTSfslB+kHYfYy6UlJB5lt YJtcnt95MolNZUkxofdwVdH3OFsMk9pxSJ9lC7SJ3Cma+MByjQ6km7FUe101yHe9CskC TdCrJPJg9tr+haaPUzHbrrR4WbOh53LB6aMpwVlL1WFzjH0ppNPUy6rc/ol+gHcR4WxQ UwqqYfydMLw0AsNfA1QsmqHWitzMsmMALzJZcMrYp+OWN8GJSMSFE5YTSX+sbtSmbEMD 5A7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AjpH9wHc; 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 a14-20020a170906368e00b006df76385becsi652604ejc.140.2022.03.31.17.21.18; Thu, 31 Mar 2022 17:21:18 -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=AjpH9wHc; 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 38AFE68B269; Fri, 1 Apr 2022 03:21:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4348368B1FB for ; Fri, 1 Apr 2022 03:20:53 +0300 (EEST) Received: by mail-qv1-f49.google.com with SMTP id kc20so883777qvb.3 for ; Thu, 31 Mar 2022 17:20:53 -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=AjpH9wHcF4PuItEYSSFL1vhDhjc+Jy2bJpogaP/3s4Spq/fy2O5l12thI1x4sDzUJX geLlNE+XRtxff3debmYwUvolcb56GvjWPGoDKLaYWziQJ1ToJcRFDbqmuEJNACl1SPVI LoK29h8A+vSlOjuZZzrNWqo6p/6qEab0Tq/Q+2fuK8pJ7EhCAuQ6nmIh+2qSEX1MxTZC ckIuxY6aA36CaoJobgLyjpN5zvzhrBcmPOuKlHtN0Gh0gV+3RZC8GLf7AFJ0gzrdVsxK rcCo4uO7+RMZzjRQgn2E5BAxGLrqLMMeOKQ9CICRegvYnh3j9bNKqvAOOyf46k7484mA 6FzA== 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=vvqtqtQuaZavjgK6EoDqsZZd2wY5BYNZLMRHBjbYQx3mf8QXl3YPE5vNdfEe99WNnm Vhl28mizJ0pyM5WqzMWzjFQ8BiZqb+wcLUIhtjlMgVo5RHGFFwe5eyYkzdGTcQrpMvos dHLybWDH8AWE8v6mb1x/JTOjxyhZ2lB1FszVfgq2pZntPoOAswFb5NrM//CKMM0hFtYK gTVdTgsG4JEcjWzUiI5q3nJxDDc710ue3znbojZ3L+2Go57Ssx2FenKLvNz3LvarrhMy hnV+bLc9bH31mzn7rgg9BhyLblNI+UKDaUrC8+poza3K6nczM15K7DVPKZK3p8DZr/c9 7hXQ== X-Gm-Message-State: AOAM530reMcb3TZ1SLMp3A8jfCK+1EY4EisEwwJ35yD/XxX+HkO569be LaQwxEJy3TR3egTqtTnvVDowuQ90gVM= X-Received: by 2002:a05:6214:f27:b0:441:1380:99a0 with SMTP id iw7-20020a0562140f2700b00441138099a0mr37349608qvb.112.1648772451830; Thu, 31 Mar 2022 17:20:51 -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 r17-20020a05620a299100b00680b43004bfsm602489qkp.45.2022.03.31.17.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 17:20:51 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Mar 2022 20:20:06 -0400 Message-Id: <20220401002006.44582-6-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401002006.44582-1-leo.izen@gmail.com> References: <20220401002006.44582-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 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: FP549/Sndff5 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