From patchwork Fri Apr 1 00:20:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 34681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp376064pzb; Thu, 31 Mar 2022 17:21:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhFQKneWx/8vnnORr9wk7Gls06G2SYj5SaRu70AuGlpGzeqXXKj/Y36wKCD5M6YbViEVkG X-Received: by 2002:a17:907:6282:b0:6e0:c64a:60a7 with SMTP id nd2-20020a170907628200b006e0c64a60a7mr7062791ejc.349.1648772487852; Thu, 31 Mar 2022 17:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648772487; cv=none; d=google.com; s=arc-20160816; b=BvMs4EUFXs2G3x6Lb7akisty5mLLnHqO7JLNO9uarO61VLF/EHnW77JoEjOdTD9NJt Xa0F74JAMsICxC6wUJX0JL/nD0tYiPDXnUE9Ler8O7aVSqkQsuOmSEYXAssQeNFbpOsG ogiOkTmZhZ6CUiE5qNqWkwpq+00ISWCprJ3lUWNs0P3AdcRGG2QOyoCui6hV3WVEpLBR XUhqeWbQBp596YUUbAqPZ5vQDeSUltuzVPurYJYsrahkeWaGkPywvBu40Aby+jVTs2td 2ihwFFcao0Iz8MUsBux6IwLYtU1TbWx5ijFc4qdUeunfixYCRoslcHiXMcdagSN8pwQ6 Jm+g== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=U44apV8ouZBECnu74/ntkBQPoa+0uleJNzvgJYIc2iM=; b=K0mfIPKOvTGEF+mm+kz54lK+MgchgoWaWLieNG1QDoZh0T44SD5kl+sSuW3c/kuy8N SQc+rIdCFcovWqtW3ddpD6PUCUqOaOF9Du6yy3w/Ep7Rx2TIoMQv8J1GFRmauttvvBlr WNsIRrJTV1RN1fyGFycDvh3w2AoC71/GoY0nJ42egvn1qrws3lpd4ZQ0txGwaLJacz/U 3voNe9PH7DV8EV+YmPDi7iwxjI07y0vHLszXKFgFgh9j5M6K6LIl9p11Rlox9PiLQTw5 PzXIELqHPpBsIvE1FMKdxBOHJIKm8xDNvn1QalaDcCZ7n3/TQdZ8O01KIJVYeevOoNTx X5IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dbNUDRu9; 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 bi2-20020a170906a24200b006df76385c0asi636231ejb.170.2022.03.31.17.21.27; Thu, 31 Mar 2022 17:21:27 -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=dbNUDRu9; 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 2FFF668B281; Fri, 1 Apr 2022 03:21:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EEAB68B256 for ; Fri, 1 Apr 2022 03:20:54 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id d142so929789qkc.4 for ; Thu, 31 Mar 2022 17:20:54 -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:mime-version :content-transfer-encoding; bh=Z9MqtLOJtbM1ekpBcRMplUhLJViBbMc1Ga63T750wK8=; b=dbNUDRu9QK+9VDeuQugpqbbHi8SPemPVfzg0LkWzxf2DIPnYDI3ywcM/UBJZHy2FdR iyqSv7wbA0mKZFmjOzaYA0WDpp55EjCQ1C2iiinl8cTEuRldGv0UrFOO4YIHaYAgCLVe cGbpFmS6DAf05twYFkjBL5uJhKKjGRpYzWsAjZCRp3/dZPVPEaaShh1oT3/NaPTXw7Qe Jk53pX3PnYkwSh4AjAKRlwKdwsDNJpLzPdcM7EKNNTuD5sdoRkUyqupfZ7w+g3h0Bqzw nlAmunS6XgAVUzMg/Y+nj8zbQsLre+d0xSzyPLiQKbAfR2FmMQghfBdwOxaai89hf4q4 HZLQ== 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:mime-version :content-transfer-encoding; bh=Z9MqtLOJtbM1ekpBcRMplUhLJViBbMc1Ga63T750wK8=; b=h7OH+LaVNt5XMMQukmLxua8vTAq5aChX4jr0QXHvx4esTWRmJpP1m2a/dLkze1TfhY yF68t2eGCAfQdfFlOvQKmpWmVraN/5jmsddUMwq1rvr+NoRoF0qDIcv3P1Ltujj59Xmw S4xS7KGNQbsJMhd3qRfpRLdCd828qPxGRtEq4Jzi+U7XWS6mZOhjWaYj7WKzyofFKKyD GG8sjp2Cbb4+TRpffgVauQfIRO8khholopTOojspvQZneqyi1fpp5/lEhP3UUkTUBypm e7/o0cuV7cZZAdkZDX9dM4felMMzp4BR99CBZNzoRSq5mrfvEfToq5JmEbnZ9//C+GLM DTSA== X-Gm-Message-State: AOAM5309nSHr2ePDzNKLZ6BzfOy5n3JqYJySqexYNhRRBWY327DVOyUx jatZbTjmGizJT2SdWeF9FQkfB6CmAA8= X-Received: by 2002:a05:620a:3728:b0:67d:4fe0:1e0c with SMTP id de40-20020a05620a372800b0067d4fe01e0cmr5354424qkb.102.1648772447867; Thu, 31 Mar 2022 17:20:47 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 17:20:47 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Mar 2022 20:20:01 -0400 Message-Id: <20220401002006.44582-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 0/5] Jpeg XL Patch Set 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: 8+XlIOucp9MN This patchset adds the Jpeg XL Image format and a parser for this format, as well as a decoder and encoder for it based on the external reference implementation library, libjxl. Changes: v11: - Fix regression I introduced in v10 with skipping boxes v10: - Make changes requested by Andreas Reinhardt from v9 v9: - v8 with a typo fix v8: - v7, but with stylistic changes as requested by Lynne and others on IRC v7: - Fully implement the parser and test it against the conformance samples Leo Izen (5): avcodec/jpegxl: add Jpeg XL image codec and parser avcodec/libjxl: add Jpeg XL decoding via libjxl avcodec/libjxl: add Jpeg XL encoding via libjxl avformat/image2: add Jpeg XL as image2 format fate/jpegxl: add Jpeg XL demux and parse FATE test MAINTAINERS | 3 + configure | 6 + doc/general_contents.texi | 7 + libavcodec/Makefile | 3 + libavcodec/allcodecs.c | 2 + libavcodec/codec_desc.c | 9 + libavcodec/codec_id.h | 1 + libavcodec/jpegxl.h | 43 ++ libavcodec/jpegxl_parser.c | 951 ++++++++++++++++++++++++++++ libavcodec/libjxl.c | 70 ++ libavcodec/libjxl.h | 48 ++ libavcodec/libjxldec.c | 301 +++++++++ libavcodec/libjxlenc.c | 379 +++++++++++ libavcodec/parsers.c | 1 + libavcodec/version.h | 2 +- libavformat/allformats.c | 1 + libavformat/img2.c | 1 + libavformat/img2dec.c | 21 + libavformat/img2enc.c | 6 +- libavformat/mov.c | 1 + libavformat/version.h | 4 +- tests/fate/image.mak | 10 + tests/ref/fate/jxl-parse-codestream | 6 + tests/ref/fate/jxl-parse-container | 6 + 24 files changed, 1876 insertions(+), 6 deletions(-) create mode 100644 libavcodec/jpegxl.h create mode 100644 libavcodec/jpegxl_parser.c create mode 100644 libavcodec/libjxl.c create mode 100644 libavcodec/libjxl.h create mode 100644 libavcodec/libjxldec.c create mode 100644 libavcodec/libjxlenc.c create mode 100644 tests/ref/fate/jxl-parse-codestream create mode 100644 tests/ref/fate/jxl-parse-container