From patchwork Tue Jan 4 16:26:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 33066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp17131783iog; Tue, 4 Jan 2022 08:29:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzzZYfcFrBClciefYv83KvwR9a0YTFBu/6WgnkKrgZLVDKHw0TRpZopP1sUD3OX/rBRR+BZ X-Received: by 2002:aa7:d0c5:: with SMTP id u5mr49161115edo.202.1641313759245; Tue, 04 Jan 2022 08:29:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641313759; cv=none; d=google.com; s=arc-20160816; b=HbXkrhRVu6RkanN2eDoTJhVeRVgX7Aw5JLAwMh+mZqxsL8vWoKzoLJkTKjCHzmIL2x yVBcpsA2CO6nzOij6nU3qFBIXrkDE34MP111bOMHtE8Z2kq2BYy5tWFwozhlfLqPVbn6 QuQV2YW/8IwrflLY7V39NOCT9e49JezIqVpNYiANF80r1Hg6lPXDeicbcAkoMlr7ZLpS T7FwNXB6Rh892qE4ngm0p72DmrfHoD3Y7gQpAJAII4yhkNj4dw23Lnj0z2DkNecOjRMq 6ncivMGgXH+IR7nPD59Gg2xNulmWYr5orezBryR4cUGCAJOnxKgQqnOsziKg6t0w3A2R IHbg== 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=O4DKs9ZT21kBYzn3P7x8h9oDm+cEi+YmcpSl4yUGMOQ=; b=zYgPh8d00F0wNkMsZiZx8BhrvCbQw1v8XfS3xMEPbWhcCrNWXTqcPGwOV0PnZQEEwO rgxd9mSQto8cXwWBwPxbsnEsB6rwh592vR64z1+dJqqrTuhpDwPrP9iLzurUWSimtq5v d/ZN371WBp+G5wKa55eZHC5k213FPxF0xpK5szxrDt965zoYjW3GRBEGOj/VTc2KtGQF pmckaXBaisk4283gR7EqJrSbFUA7d1IcyTaoeFq0vzQffHBl7QOA62mQEVv2XZE1R26p NZDyGdumj4+qt78iN/U6kaT9ysJ2es25FAhgAj7AUZsZHPObgBdA6+hZSnuN6CwsZfdq ZokA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=F+M09ne+; 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 dd9si19649752ejc.169.2022.01.04.08.29.18; Tue, 04 Jan 2022 08:29:19 -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=F+M09ne+; 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 01B7F68B2C7; Tue, 4 Jan 2022 18:28:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3405B68B1A6 for ; Tue, 4 Jan 2022 18:28:50 +0200 (EET) Received: by mail-qt1-f181.google.com with SMTP id z9so34602482qtj.9 for ; Tue, 04 Jan 2022 08:28:50 -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:mime-version :content-transfer-encoding; bh=qzhgsGplTd7VPTQDT4X62UcSwZAo/evDoj2eplVKzOs=; b=F+M09ne+ffgMEUytLWYlgSxuJuME/ct/cOXFw+SYOGjUkvDB5PCMSLouaUBtgFuPWJ jrD3sbHCIl58rX7jaPMNwiUNQ0mInxmo56r2nrHevUQG0Vx3l8wj+c00n/7FeGGJlH13 Izfu2VH6W5rC7QR//C5Gdc7Jj2HI6h1fH66k0qO+ep2RmvGoqXTxlKe4LTPZHOwM2eXr 7OwdWVxwbCqtZIQUCmT5xrJJWlR9WbiuHgEQXPiIYyGdcNrUql4O+hqmsA+y1xhk3niA QTtq/NVKmWG95Nts5glUElDt0y4PjDN2NShgRt6qXe9LO52vr05JcSpA0g3Rh0a7fMqk k3Ww== 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=qzhgsGplTd7VPTQDT4X62UcSwZAo/evDoj2eplVKzOs=; b=MZuimSu9+DREiVxWGLHertXF4urH8Kq8sdZlcblmAX39cpB9jsR85vGlDr7jN8VhS2 PNfoZSzSEfujxov9fmEd+1+qWsrnZn2YhdM0qJLPvb6KKgiW9jgz6Z+CrdOsC2C0fYBj 7AtOsPBpAxo9IIZy+b+GxJgg2Uxb33Hr+5G0u1t7PIssEiud6L7qcbTmXm7Jk8MnVtF6 fioHGeNWlsmeXVBTxEtMea510sKoVm4PbAdR+tWnlfvktqGAZH7TvI5h/U3+OM7r6gD+ 3kB1FVHdkNsDFUFl47apoBTT+yUIC5LQQlkvGCWHZ+8kxKe9Uc0dVJbPLhHLUd3Tsv87 SVeA== X-Gm-Message-State: AOAM533X90Uh3gOb9wX4O+980I6Ub1o3/E/UpyG+ygBgb0/yY1Abibsv Rl0Rp9iv52GNVv6zWyOoIUjJ3RIvT/Y= X-Received: by 2002:a05:622a:3ca:: with SMTP id k10mr45007915qtx.130.1641313729013; Tue, 04 Jan 2022 08:28:49 -0800 (PST) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id v5sm32623567qkp.126.2022.01.04.08.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 08:28:48 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jan 2022 11:26:31 -0500 Message-Id: <20220104162632.52767-4-leo.izen@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: p/C2sNcoyk64 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 | 19 +++++++++++++++++++ libavformat/img2enc.c | 6 +++--- libavformat/mov.c | 1 + libavformat/version.h | 2 +- 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 1054ac9667..0fa1c82ddb 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -506,6 +506,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 a6084ceef0..44336d812d 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -30,6 +30,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" @@ -834,6 +835,23 @@ 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; + /* 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, 5) == 0) + return AVPROBE_SCORE_MAX - 2; + else + return 0; +} + static int pcx_probe(const AVProbeData *p) { const uint8_t *b = p->buf; @@ -1153,6 +1171,7 @@ IMAGEAUTO_DEMUXER(gif, AV_CODEC_ID_GIF) IMAGEAUTO_DEMUXER(j2k, AV_CODEC_ID_JPEG2000) IMAGEAUTO_DEMUXER(jpeg, AV_CODEC_ID_MJPEG) IMAGEAUTO_DEMUXER(jpegls, AV_CODEC_ID_JPEGLS) +IMAGEAUTO_DEMUXER(jpegxl, AV_CODEC_ID_JPEGXL) IMAGEAUTO_DEMUXER(pam, AV_CODEC_ID_PAM) IMAGEAUTO_DEMUXER(pbm, AV_CODEC_ID_PBM) IMAGEAUTO_DEMUXER(pcx, AV_CODEC_ID_PCX) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index ded91d6b98..6ac430c6dd 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -261,9 +261,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 2aed6e80ef..4dcae73c3b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7463,6 +7463,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 379a68cc7c..9b90bbf156 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 10 +#define LIBAVFORMAT_VERSION_MINOR 11 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \