From patchwork Wed Mar 23 10:40:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 34924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp856190uaj; Wed, 23 Mar 2022 03:41:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzI/XiCavE/EnT4zvBWUGe9fmynOFgOYqIS9tvoOAW2mqN2nezGxDhO9mWv1BPkz8DO0MY6 X-Received: by 2002:a17:906:4793:b0:6e0:5798:a97a with SMTP id cw19-20020a170906479300b006e05798a97amr5090766ejc.88.1648032073164; Wed, 23 Mar 2022 03:41:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648032073; cv=none; d=google.com; s=arc-20160816; b=pSIzXhoXC4wkJsQr9mrjJn3RpPzk3suBLZeCe3GsCerR9NXvQ3EBgppSBzkNJlDldV qfh25yD+86CQZZm0AUl6r/mvpsQJAyZQsnsL8l6BIufHZvv68Vzc9WCg87jS9n60OGZT nvzZjzrfSVPMNk13H5d5E4LfJdMA6fn+pNLUqUpIgMiURSv5RZatuceDRgXKQQQ7wSuQ wCVtOk+8fig6mI6f5MUNGpcst+IoOpiZZJlAEIG4wH8ElNajztmeWVtMq8EO72a108NF +ffK+N/KUolsFY1w+c3KXrpQ8DwqvYPy6tzcvVJuTPh8dWOFp18OzfpZPjna2rgnkl1G lqqQ== 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=sXFMXdeXa1dn9a2PJR6tNpuFTiXGB78u8t08bAt2B/iVtaMzz6cJ8lBqRnZKxuEBPj GF3uSWEqXQF7tJVFdhgv+JCXWcDXEgflYohbz6kXUOFTldB0N5+i8W2lJrAMA2/868Vn T3IFZ7SLT7D5rT+UJcf7SW1Jz5YOTkiI+IoWvfB0ZcTLlHRnLcIdSNyB5C+6+mIXMesp NnNL0eGEmTxGYqrqlejlsSRnP+UrhG3li5683W3KCiptauTS0DOY4gz8z5/SnxwJNweF PCXe2Rcsh1dh9g0fkkQK98718WggkSkBgpzOBq/tEr6IBwkxwildSlH3d2JHOsMbzQZo rbug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BBJlrnqx; 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 j12-20020a170906278c00b006df806a05d2si10868828ejc.767.2022.03.23.03.41.12; Wed, 23 Mar 2022 03:41:13 -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=BBJlrnqx; 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 ABC2268B194; Wed, 23 Mar 2022 12:40:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7973068B10D for ; Wed, 23 Mar 2022 12:40:34 +0200 (EET) Received: by mail-qk1-f172.google.com with SMTP id p25so681688qkj.10 for ; Wed, 23 Mar 2022 03:40:34 -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=BBJlrnqx10C6pabLACgeDqpyjynQC7bT9j1mxovDNW66SkljSmwysboKvYFlGNYdZb 9vBzSGOJS6qqX3f+MJu08MhbSqsLQWURor+fjlZz8tAwWRey0B4IdHPYYQugQIZ0uuTd 0PAoMgw90F1ukCa8A2PvuGPwu/rPCdYsUoafMk6Ed6lCu4OVPDNtM9YgZDNpyEERA6kB G69E1N+c7d9sUuxKDLMAY5jz3lD4Ec4kLYjILQcjI4G5pVEHWyVDJmO7MvAGpP0EV9ME Ns5Jlyd05U1xxzYvms9LpsGsNBprYqVJnwpDGHuZ0vUsNyBvF0LG4SnSlDZM2syZcEiR PM1g== 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=ipOloNQ2S/1yCBAPhjnyw2hR99Bktiin+XHizy9cdjqK4GqMDbvxwF8W4PObzg4Wit alps3GG7dHJ2estZ9BlF9CKWaq65igiJDxy4lHXZDdbH1Dp98rj4t5YzdLXffBeVt/AM rKC0cYJlzot6RXeFOIwtyV4CBYRzpF+zuoABEmhiBqZW81ASsW61O5nEw8Yfb7sBESwi iM8QvvKb40IZwXGZVLXSrGbQtD7Udaq2FIGQ0/IWapQE6LYLjyV9wJd/Zu/xcmdnSbIy oQPkKZFhtKzabt4d2h3puZgbSrMCuK6momI3Au4UtEiXrOPHKg/pSPr4tAiAbQW9DvNJ bfew== X-Gm-Message-State: AOAM532Pi3EdnKCCWQKcp4i2NihO/FBeNwqbKecA4GM8NZ/XpXEWGRjj n0tSbGfE4rnUN2fSh1RYOwmAEstkTUM= X-Received: by 2002:a05:620a:414c:b0:67e:cc71:9318 with SMTP id k12-20020a05620a414c00b0067ecc719318mr1927948qko.462.1648032033259; Wed, 23 Mar 2022 03:40:33 -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 d12-20020a05620a158c00b00648ec3fcbdfsm9918274qkk.72.2022.03.23.03.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 03:40:33 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Mar 2022 06:40:02 -0400 Message-Id: <20220323104003.2906-4-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323104003.2906-1-leo.izen@gmail.com> References: <20220323104003.2906-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: h15Lw3XlWfB+ 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, \