From patchwork Sat Apr 2 20:12: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: 34682 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1245612pzb; Sat, 2 Apr 2022 13:13:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVWdR27Cm7eTSk5lsqYZoJjakXa+okUFjSlGhf9u6heRduT1bDatPjboBxVtUhQvGjgW6J X-Received: by 2002:a17:907:3f03:b0:6df:b04b:8712 with SMTP id hq3-20020a1709073f0300b006dfb04b8712mr5014159ejc.290.1648930396042; Sat, 02 Apr 2022 13:13:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648930396; cv=none; d=google.com; s=arc-20160816; b=e+GSiy4rH5lXUQI2PRrOA/qPudHpxiGwJlqrmuRw0VCCEUd8z+J5Rc0FleaHo29GAy AEvbfPPJf+PjSXzitF4D8Zvhn4ryiHfLwmxshhtLswoepySLfOzC3ZdQCL4SvpfHFCNI lVDA0Vmjq1lY5k8DwcIMOVH28PDgbyxmI+O9Lpsz28VE1xS3PcQloOEBKFEZvUzsT3FC F5vq1Um0u/juyQ19EGE3DlXVCY7FBZHERF6n7LQcqihmqSglJfXitDQUnqpQBNarld+H E7Bb/gRj4EMCMCh5gOpjQp1iDHxMP5OvpzR4n+WMzRRF8P3l4p+1imZ/wT7ljKmygNqM bbEg== 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=ck6xR3SwNo9R1js9ijaQ53XxBJr6PMAxh2pOYPGzR5I=; b=XxeMAPt27/TE3zpCWS4vr7m9HnXxOMLOEugijp3MljVrv5atYQH6fPOe6fwJeNoDbr HjGe6rsBva53HGyfD5csCkqGqQsrUpll6u0xjBb3tmpwlkfQ8jKflXi7rsJ90To7MQtn IYp1nOxWEdh+LruUr3Darhk0y0Vq76m+YivyKQKFcz7XrWPRXS87ElPpjpuN54Mr/vEO 11+K0IAbJTmgYxSddvXOWxAG6/DzCEWOy1x5mgOkIKjsHvxhwpCg3+VuUNVuq7kn+tjK 6X80fVWoTc8jKuo7AWa5u2Q9SeKOM/7/j6FDh4a/Nb9ncvQzlj5pmGkzEI1RWQz7AFd+ ChGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HZKqWf3C; 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 i1-20020a50e141000000b00418c2b5be58si3667561edl.314.2022.04.02.13.12.52; Sat, 02 Apr 2022 13:13: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=HZKqWf3C; 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 2F09A68B1DD; Sat, 2 Apr 2022 23:12:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EC6468A70F for ; Sat, 2 Apr 2022 23:12:41 +0300 (EEST) Received: by mail-qv1-f47.google.com with SMTP id a5so4590602qvx.1 for ; Sat, 02 Apr 2022 13:12:41 -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=mrEAkxnZfjupTKM4ZlgR+gOTizSHLwS1crwa3IvLd/Q=; b=HZKqWf3CY066J/eIW+qKBNJxFpPfLkNl80O3xDHYMMpiM8+sANBlzP1VFqfsSRISjb sZOwjY/bpBKdOf9LRMQ4wNX0aSvZClHGDG8ScUiGucUpgOxzawDX49L2QjHeUhg5BC2h mffPmKfmn8cXVcDk6X7VkzCkJMtepUk7h4PJaXfSXlsgjFZm0BylZnLeyoGYlFx/5AXU OjtYEIEBnryvzCTeowUnAPRKvAJWqIAIJIzcrv1nbABGutwRcm6ycjQKGzN7Yxy6dIyu dY/loDO2yiVYLdMYBdcMr8WaGTweg40uPKBhPLm9/Qewo2WKgCZpytdWPNIDitsqK7vL BraA== 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=mrEAkxnZfjupTKM4ZlgR+gOTizSHLwS1crwa3IvLd/Q=; b=TWuQ0VjVv1J6diq0I4X5HFU4sOjAOLHuYEuTr3RDBhGzI7w4eN4JM6rhC9r922QImE FWWEhozt6tNMk82CRC1CYicypVv96fTmKAmQNmEydEL5OD8zrlyhN4h8Tz1O2DtyFFaq jR27baQTrWbg1pMNyUnzpCGnVBWqrALegY7GVLu1eVTK19RWKWGLU7b6MY0WlU7CaJUm uh7ifbhwRg5SChu6esgDhTrBStdHm/8HXqGDFoHmQWzAOlRnkM7Mw6QZWYFHDC/drNsr G4RF5v7TqQmULDYblh0Pzs2i8Tz5pqJ7MvJPGR42HD8wA956DB34ocGwMTRivoq9jb/X z+0A== X-Gm-Message-State: AOAM533K//SrrFC4Why2yqObB5mmEuZKs7E6Utwj1wADnb+h94CE7PRI g7CzznUNUAr8K6L8KoetpygzlQXnlDg= X-Received: by 2002:ad4:5b89:0:b0:441:6e09:dbeb with SMTP id 9-20020ad45b89000000b004416e09dbebmr42845865qvp.53.1648930359735; Sat, 02 Apr 2022 13:12:39 -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 h14-20020a05622a170e00b002e1a65754d8sm4743937qtk.91.2022.04.02.13.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 13:12:39 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Apr 2022 16:12:06 -0400 Message-Id: <20220402201210.86308-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 0/4] 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: IJ80EoddFEkE This patchset adds the Jpeg XL Image format as well as a decoder and encoder for it based on the external reference implementation library, libjxl. Lynne said she plans to add a proper parser in the near future, to provide features this (removed) one did not, e.g. finding frame boundaries and box concatenation. Changes: v12: - Remove the parser in order to avoid avpriv in the ABI - Add a lightweight version of it to avformat to help the prober - Remove the FATE test for the parser which no longer exists 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 (4): avcodec/jpegxl: add Jpeg XL image codec avcodec/libjxl: add Jpeg XL decoding via libjxl avcodec/libjxl: add Jpeg XL encoding via libjxl avformat/image2: add Jpeg XL as image2 format MAINTAINERS | 3 + configure | 6 + doc/general_contents.texi | 7 + libavcodec/Makefile | 2 + libavcodec/allcodecs.c | 2 + libavcodec/codec_desc.c | 9 + libavcodec/codec_id.h | 1 + libavcodec/libjxl.c | 70 +++++++ libavcodec/libjxl.h | 48 +++++ libavcodec/libjxldec.c | 301 ++++++++++++++++++++++++++++ libavcodec/libjxlenc.c | 379 +++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/img2.c | 1 + libavformat/img2dec.c | 18 ++ libavformat/img2enc.c | 6 +- libavformat/jpegxl_probe.c | 393 +++++++++++++++++++++++++++++++++++++ libavformat/jpegxl_probe.h | 32 +++ libavformat/mov.c | 1 + libavformat/version.h | 4 +- 21 files changed, 1281 insertions(+), 6 deletions(-) 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 libavformat/jpegxl_probe.c create mode 100644 libavformat/jpegxl_probe.h