From patchwork Thu Jan 6 13:30:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 33123 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1653483iog; Thu, 6 Jan 2022 05:31:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJx1kzQ+Ldo4MwzOkNGP4bahAeygqyL0U2vIq55P9E5o3bwYYci+irZCxLmNW1DWJyCjQxyd X-Received: by 2002:a17:906:6805:: with SMTP id k5mr45756591ejr.750.1641475890433; Thu, 06 Jan 2022 05:31:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641475890; cv=none; d=google.com; s=arc-20160816; b=edthC1qpwFPitfuBa2H/ltI2/oVZ8bsUj4epGL6ztxvY/zMvjtRO4mZWXtgmYKuqvE PJn+t3w9lxv47+d9U3fRVfJncCqK+jsNyRFuTfotGr4/emIQuMHhi7c4CXvLoblQqtLB VbqqBnjnhNqniq0sXA0sAV2sf4ql2MIIGz44jxJIUNYBkK2o9PrEd/PlwmFqbyV1oJ1X nS2aW8x0a7zjQ++repoKrbLUXXs+kXpXQtXi4Dm2fiHUb6n0nvBnFQPLeh4zAq9/0AB2 JoA6Gygrdpr4lscO0Xc0m+2G7+FcD9CB96nWyhzayXXnMX4CBTQdzc6aH0393+PFV/bE UMKw== 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=yh0FP3dnSw9vyT0K4d0VLgQyuTLLB2k2SJ9M+0mVxjw55ykxMH6MIQYazFdis4rV3V Gwj988v/dlLQ/GeT8WOumDmssgVcWaoIFO9ofEO0lx5TB14eM8FGEorf+OeEbG8Z9dAU sNAsF8cezn7Jlmy3BmY9HSNqgmgpbgpOwiaFBUfC77s9utPhLznuVg3HVWFM40z1H/QN OBfbYBUhN2FKQNu+tiIVTgCmS+xxnfxIDl7ir2lKWty0HDbX6QZ8gv+xg2/iovCXxDkY CPcdB2eRYYf0+nw9Lej1IZXdOG4nfYwNDtn05dyxIiu1gBbew0vPW/HDli4ScCbmHiCs CLdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KS5FbUsS; 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 q7si1161339edd.118.2022.01.06.05.31.30; Thu, 06 Jan 2022 05:31:30 -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=KS5FbUsS; 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 AE55968AC87; Thu, 6 Jan 2022 15:30:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6518368A9AD for ; Thu, 6 Jan 2022 15:30:51 +0200 (EET) Received: by mail-qt1-f171.google.com with SMTP id l17so2233508qtk.7 for ; Thu, 06 Jan 2022 05:30:51 -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=KS5FbUsSNKYiSpIQZqThm2ckACV11opfAeJKyvlMk/KcLh8YZkNjkAKhb0XGn99Rh4 QPUPN5pWMhnyfmOqhKArLOJLBv5+27kYSdFFkr+zEmCJKg8Iv4kDOtmTHXZ/Y8NhWoqR RW6VNwko49Ewf+wgdAnjcIeyfgN0WGKT20GVxxdDC9PDfFyIDPWS6yEBLE/elUgj7tus BDgU7IUc+Z8uRhyuroz0XwM33NiZ+ZYZoVxywdpIn7AwsvvnxSUlTdbKiIy0R8EqOQdU JHqxNBY2SEPZFQWUknAjamHfY41Bh6OQh6XlSqUtgIEwTmCVTXFbN87S9HgxfEdpLJSy MHSA== 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=2181jbqww4QkgEvAh6AQ+1C0UkyVd+9QW7bzfaq+FQ4cq749bodEy3lswYj5WsZyye tvmWtEHI3g4HBnmzDC3d7fAHtcrgk0unuOnt4cCJHz4nj6ipmf4atKs9rfgkzLwmbQmw /Qa2LtJKkrGCJc0WMC7qCRxmc5TQg+eDkR+USaBlwRwZlMsERoI14lPicgBCwdwZ6bjP kEhQTKze2HJBBV5nMfh8rilHAcATQ8CXo8+4704NCMnhwQd2QTCsx/R4m7MqnjcLAXo5 aTaN+K0z1j8Bkvzo8a2zM8HzHPoGLh5h8zWOkZsOystqjSuVmVILvlkrVsjNmbD+6Ryh 34Qw== X-Gm-Message-State: AOAM532j7zGVVj1hlXZdUAXPhAw6LBMmu+wtgCXmjs048kHyGBNR7HHk 2ZxbvyC0j8NTW3tOH1HIDzhOv+eqMW4= X-Received: by 2002:ac8:7650:: with SMTP id i16mr51430050qtr.220.1641475850072; Thu, 06 Jan 2022 05:30:50 -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 v1sm1690434qtw.65.2022.01.06.05.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jan 2022 05:30:49 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 08:30:17 -0500 Message-Id: <20220106133017.222689-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220106133017.222689-1-leo.izen@gmail.com> References: <2059c091-cf7f-fad3-c824-53253ae62b5d@gmail.com> <20220106133017.222689-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: 7IAz+PiUMT69 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