From patchwork Mon Feb 28 21:12: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: 34548 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp3080387nkx; Mon, 28 Feb 2022 13:14:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0z9rwad2uqvIC4kzwsvbzZhFye+3qr3M3ElJFzVld3gopCzhlSiAstepu0etOdqOALqOZ X-Received: by 2002:a05:6402:17d9:b0:410:aaaf:6467 with SMTP id s25-20020a05640217d900b00410aaaf6467mr21980519edy.38.1646082842172; Mon, 28 Feb 2022 13:14:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646082842; cv=none; d=google.com; s=arc-20160816; b=GgMXdimOjZvkb1ipbawJBtU+rJu5xPqldKsYSmbTU2r1oher+zlok27UOGoJFzMeKq J+wyCp02IX67EeMRScs1zUFihDoG29YZ6seMtrQZkMw650GxbZ/+nC11h/OXATemSTt0 3dsTGn3EC30h5Jo1lV+iPeJatHhuM2M6t0J+ziPdW7rAE0HhxR081pou3c4X+mDUdMZB uGrWk89e9BKiFQCcxPzQeJedxjoG0tL7v+eUItNzU0o8GoPBcJykqrRonLMpscP2YxEN 1xraqBvKvugEzrElHcGn0zEmpofDSSvDiHTU8GKabXBUjddhjLv/f73XkGYL1vlRH7pM WVxw== 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=JwAe8GWfB3kz/IpwhKLliUDSfNwdmGwfFucPNc+jpyWJYKomeyd10+eKBfcyraC1DK 0i0vjKwZOYWo5y0AzoW2wUR0wxxy1XSPxcUp2GQrxcbPERtaoBAgPdVwQfgt1eafSP/T A3D4AUsCbKouaJdhwyBk7WKgKGQoLeaLcYLnj1ClDl2q/ZusAIrd6oGCrhFttTCoLwXJ E6ZBaaIxJkq8oTOzQFjprgRmGykFcw0mQQTyr8gegbMzMajR0zNYAIR/CCQqcL4xybiU xGOi7tvdhSjQofCbMsh0EA+nO0ma84t11Ggtxlli8BNj5OAmYVXFcZIq+SgyNi3098cU ytfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Iu9VSlKZ; 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 n20-20020a05640205d400b004132b55c34bsi6650846edx.375.2022.02.28.13.14.01; Mon, 28 Feb 2022 13:14:02 -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=Iu9VSlKZ; 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 5179768B080; Mon, 28 Feb 2022 23:13:46 +0200 (EET) 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 0450568B02F for ; Mon, 28 Feb 2022 23:13:42 +0200 (EET) Received: by mail-qv1-f49.google.com with SMTP id w7so14813360qvr.3 for ; Mon, 28 Feb 2022 13:13:42 -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=YWIHPIqAlaHa2G/282qM7RfbNMbHRsD1UVZ12G6SggU=; b=Iu9VSlKZ574/vKpjlxwZedlbDfYfoWZ5pBbV7GM9wOoENnUKeN7/P8x9Y8F+hXR4l6 MJr4V79PbiGESvsXsKRzs1HJrfqA+wDqe2zUg3/PN657R6nRiIpydH9uo+t83czif4A9 PgcWEzX+SsJE3JU43y76RXNwAEiUy5PKSxZWGiPumvkvyjwO23/1XYQ8xLVB0JqH7jFH vyWXCo8/U01hlBYOMFegiy6Zh5y+eK1wg5EnaSGNPfaqmzaGN9uEDrvtFskrDqpiuGPa 4M2THAylugsPHclvSjebAnhDLfOYLCkHqQCVkAtPF31U/XXb3WYh4Zmc02Sgfg9hEQOZ 1NDw== 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=nH3PkU1/jA3gFFAXbX5H53mPnN7Bpw4l8GzQRJPPmmPuoca1pjACALxe6u83VaOEmJ N6q8hAFQT4FTIVsLL7HwGU56+hEzSRqdIBL34rqdZ0Q7yMfc23hkDI+rksfyey5uotx9 SIhBlvvTR5BBt92kCC8o27IF6GlWqXI+7IF6ltskPUOeWSaFwqN2K8qBtLONVaCRKPTL 44oOJNpQO8nZ8DlUhuYldkta5E+1US0/HTNuIFD22I9jgq2xdfc9ppWx1nJmpm+tsRyb qJuXY38KMo5cJ/FVwVbzY7MfIlV+OF38TB6+ekmhYXFkK8hARWet35tDcm/5oF7oJoXy s5Dg== X-Gm-Message-State: AOAM530HAgZW14cFIpAiGyVOBhafktH58cXIXOBIQbVO6ULGejg4mhJT cLm0drvVQwhV3Jq62SUigo6Stwi0N18= X-Received: by 2002:ad4:5dcd:0:b0:434:66a8:6ce7 with SMTP id m13-20020ad45dcd000000b0043466a86ce7mr1435801qvh.93.1646082821443; Mon, 28 Feb 2022 13:13:41 -0800 (PST) Received: from localhost.localdomain (96-85-112-126-static.hfc.comcastbusiness.net. [96.85.112.126]) by smtp.gmail.com with ESMTPSA id s19-20020ac85cd3000000b002de4e165ae0sm7772218qta.75.2022.02.28.13.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:13:41 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Feb 2022 16:12:32 -0500 Message-Id: <20220228211232.4152-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220228211232.4152-1-leo.izen@gmail.com> References: <20220228211232.4152-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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: +7bl8u0fx6SY 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