From patchwork Sat Mar 19 17:26:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 34855 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp380597nkc; Sat, 19 Mar 2022 10:28:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDmjYMlqWEhZGE1oZJSU43ug3Z1Z8SlbYdnXxZMJYA7MHzSAWmW49gbLVefSfAUHI1HUSI X-Received: by 2002:a05:6402:51ce:b0:418:5745:f869 with SMTP id r14-20020a05640251ce00b004185745f869mr14962187edd.39.1647710887340; Sat, 19 Mar 2022 10:28:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647710887; cv=none; d=google.com; s=arc-20160816; b=Y/uA/e+xclA++gkw8UxmV1RHwlx5yi8pZxtumxjYRRCXyegAqjYIRBYuqO/cIDj7sd riYE7EkeC7YrjyrA6oBXJCZIDsLfBPDLFofYZs9XeNzSOI0h5IRgHZzabPlqBDkBcUEX QHl3qwRRUqN/c9oArOtV3hwuMbdaFBUjoXg7TBiArB416NQ6tPQuBDjhlAu/VHS5z8Uz 0wf660XR5YlL6USRUmkjIElWBGWG4qk+HXY2Doh29OW5qPfEMfLCgIqscRBxUB6rtHqo ipipaZquvSlMzcj3CiC9Q3S43rb2HwkjDtogff7ZP2RncWEuvAxK60fArY3j3n9gkGNm lBmQ== 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=LFnTG8jnTzvUhxvoEb6sbo7iGGgPyEm08PRDf/ExFxE=; b=WVlVfQ1pI8XvPzc2T51af0V1zQ4bH0Uad1fpjni/Vop/QQioJXKGfRkQ/QMS0Gkwoi cBBDgkF83NGzafH+M1Fop3W3Fzp3wUF6n/t+fzCtyy0EDxFzPW6PQb5SAqACnLOv1Hg5 S4GMRj0g7v0AKOknEbc/+8zBZM0ayXb/WBp84WTawQ3iEatsGh5Uu2jDuC4wynXX+Zbf ncw7pObBzlPhu+bXTliJfBClBQXi7LZySauYjB52q9KPHnHXfXkxnmrQQe2/6f7XLb96 ARl+zEghGxK26POEIIFunF0mMBvfLZXEvbUpPxVQEwxq6Tvriw6rVGZ7FlLlrkNgsGw7 q7Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Wf7c1nR8; 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 t1-20020a50c241000000b00418c2b5bd45si6230067edf.39.2022.03.19.10.28.07; Sat, 19 Mar 2022 10:28:07 -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=Wf7c1nR8; 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 6AFAE68AE3E; Sat, 19 Mar 2022 19:27:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28E0668AF33 for ; Sat, 19 Mar 2022 19:27:27 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id p25so2540264qkj.10 for ; Sat, 19 Mar 2022 10:27:27 -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=HDGK9WpScVeMtha6VzxaHMU8npX6OpsqVD5LqpzxJKY=; b=Wf7c1nR82PmwH0GRi+3aUR+eba488o5FvdheaXclv/pQC6e0qFNdKe/PUEGHk+ItYr 1EJel6K7G4lUBn4rXm74BSbVkkKNatIyZwltTOVOkD+5LiEPIeTm+KeaJv9PLRhYJNPt nxeouyjk4SCuRbOqInKDsM1AekLpww0koqWbxw8QcmjEc/Aepn8HCmk9MSKWQmbH3cVe RwNtMZsKqvJQIeT4dk66bqTXVOH8czyIb4qcQPh345OVz7WJlo6K3rpddt+e9TdVrKVi 9QoDDDN0HyrWCf//KEix9fgHtesFlRWsKLV0bCXF4xldoUT27gVyvb7CMqQui1s8G3Iq jXoQ== 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=HDGK9WpScVeMtha6VzxaHMU8npX6OpsqVD5LqpzxJKY=; b=4jO9mSesAp3r5IW1/ODZ6TjyUSjnGO0+8mTKV1MV+46HgUcM/oI85y3yOAQBucpASE uHxeJcwozimuYMwoggPEwc4pagXdDGTx+TwhNg83mADlViOo1SIKDCw06Xbdbx7ekzM3 70qtwy1rtJJ/ULIk81c+iasSFbNBhv1t7jN99bzNdA/UZy3WIIzvKZTI14/Mmgn6F9uz Wf2gO1qQPYaqerZoR0PLNe/qJPB9QU5jCj9MhmTuBS9sO+UNhKr++mGOkU/qBa0fRVIo xPiUt31EbjN8uH+jo74PNCxOFcgW+eLbO719+JaJPmyh8ytIed0ghmpPaS+aY2wuU2JN CbCA== X-Gm-Message-State: AOAM530oRyfHqER+KY2ei7RxgwE3ISOjwA243OEJGxj7aFBVcdazkcAo D60wjkSkJ/Vu5Rhk+UAHm3wnGIODihY= X-Received: by 2002:a37:a4cb:0:b0:67e:5e1b:dcea with SMTP id n194-20020a37a4cb000000b0067e5e1bdceamr4120181qke.101.1647710845778; Sat, 19 Mar 2022 10:27:25 -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 q28-20020a05620a039c00b006494cbf8f5asm5302402qkm.22.2022.03.19.10.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Mar 2022 10:27:25 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Mar 2022 13:26:44 -0400 Message-Id: <20220319172645.82718-4-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220319172645.82718-1-leo.izen@gmail.com> References: <20220319172645.82718-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 4/5] avformat/image2: add Jpeg XL as image2 format 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: xqWH1aqsrVZw This commit adds support to libavformat for muxing and demuxing Jpeg XL images as image2 streams. --- libavformat/allformats.c | 1 + libavformat/img2.c | 1 + libavformat/img2dec.c | 21 +++++++++++++++++++++ libavformat/img2enc.c | 6 +++--- libavformat/mov.c | 1 + libavformat/version.h | 4 ++-- 6 files changed, 29 insertions(+), 5 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 587ad59b3c..941f3643f8 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -510,6 +510,7 @@ extern const AVInputFormat ff_image_gif_pipe_demuxer; extern const AVInputFormat ff_image_j2k_pipe_demuxer; extern const AVInputFormat ff_image_jpeg_pipe_demuxer; extern const AVInputFormat ff_image_jpegls_pipe_demuxer; +extern const AVInputFormat ff_image_jpegxl_pipe_demuxer; extern const AVInputFormat ff_image_pam_pipe_demuxer; extern const AVInputFormat ff_image_pbm_pipe_demuxer; extern const AVInputFormat ff_image_pcx_pipe_demuxer; diff --git a/libavformat/img2.c b/libavformat/img2.c index 4153102c92..13b1b997b8 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -87,6 +87,7 @@ const IdStrMap ff_img_tags[] = { { AV_CODEC_ID_GEM, "img" }, { AV_CODEC_ID_GEM, "ximg" }, { AV_CODEC_ID_GEM, "timg" }, + { AV_CODEC_ID_JPEGXL, "jxl" }, { AV_CODEC_ID_NONE, NULL } }; diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index b9c06c5b54..32cadacb9d 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -32,6 +32,7 @@ #include "libavutil/parseutils.h" #include "libavutil/intreadwrite.h" #include "libavcodec/gif.h" +#include "libavcodec/jpegxl.h" #include "avformat.h" #include "avio_internal.h" #include "internal.h" @@ -836,6 +837,25 @@ static int jpegls_probe(const AVProbeData *p) return 0; } +static int jpegxl_probe(const AVProbeData *p) +{ + const uint8_t *b = p->buf; + + /* ISOBMFF-based container */ + /* 0x4a584c20 == "JXL " */ + if (AV_RL64(b) == FF_JPEGXL_CONTAINER_SIGNATURE_LE) + return AVPROBE_SCORE_EXTENSION + 1; +#if CONFIG_JPEGXL_PARSER + /* Raw codestreams all start with 0xff0a */ + if (AV_RL16(b) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE) + return 0; + if (avpriv_jpegxl_verify_codestream_header(NULL, p->buf, p->buf_size) == 0) + return AVPROBE_SCORE_MAX - 2; +#endif + return 0; +} + + static int pcx_probe(const AVProbeData *p) { const uint8_t *b = p->buf; @@ -1165,6 +1185,7 @@ IMAGEAUTO_DEMUXER(gif, GIF) IMAGEAUTO_DEMUXER_EXT(j2k, JPEG2000, J2K) IMAGEAUTO_DEMUXER_EXT(jpeg, MJPEG, JPEG) IMAGEAUTO_DEMUXER(jpegls, JPEGLS) +IMAGEAUTO_DEMUXER(jpegxl, JPEGXL) IMAGEAUTO_DEMUXER(pam, PAM) IMAGEAUTO_DEMUXER(pbm, PBM) IMAGEAUTO_DEMUXER(pcx, PCX) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 9b3b8741c8..e6ec6a50aa 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -263,9 +263,9 @@ static const AVClass img2mux_class = { const AVOutputFormat ff_image2_muxer = { .name = "image2", .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), - .extensions = "bmp,dpx,exr,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pfm,pgm,pgmyuv,png," - "ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8,im24," - "sunras,xbm,xface,pix,y", + .extensions = "bmp,dpx,exr,jls,jpeg,jpg,jxl,ljpg,pam,pbm,pcx,pfm,pgm,pgmyuv," + "png,ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8," + "im24,sunras,xbm,xface,pix,y", .priv_data_size = sizeof(VideoMuxData), .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, diff --git a/libavformat/mov.c b/libavformat/mov.c index 6c847de164..c4b8873b0a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7697,6 +7697,7 @@ static int mov_probe(const AVProbeData *p) if (tag == MKTAG('f','t','y','p') && ( AV_RL32(p->buf + offset + 8) == MKTAG('j','p','2',' ') || AV_RL32(p->buf + offset + 8) == MKTAG('j','p','x',' ') + || AV_RL32(p->buf + offset + 8) == MKTAG('j','x','l',' ') )) { score = FFMAX(score, 5); } else { diff --git a/libavformat/version.h b/libavformat/version.h index f4a26c2870..683184d5da 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 20 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 21 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \