From patchwork Wed Mar 23 11:03:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 34930 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp859811uaj; Wed, 23 Mar 2022 04:04:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkCUYgyFRf23Tq9bbrzY42UR2jnC+r15SFVIeqvIwV9aSnu7YSs7CiK5uf5GvyO21z9rK5 X-Received: by 2002:a05:6402:510b:b0:416:9d56:20e with SMTP id m11-20020a056402510b00b004169d56020emr33989802edd.264.1648033478585; Wed, 23 Mar 2022 04:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648033478; cv=none; d=google.com; s=arc-20160816; b=B5DYkXwBknay+jd1XFpaG4wQnOxeB1qnv8HJ6qemWhE2kJG6OzQsLh5foR6W9N1QUH p2ikELuYjo/R+mF4S1h39PUCnMWxMwHLZMKQ5Y8J9i/+bt/nNuQoiG1OYQ0D4rSmWe/b lUCIQwXia15cCY1+Lzzi4WjB02U0mI/DKTiPiOTNyKXlxMItET5r6trfXRUWFtp/LCyY Bm1tc6aqiL71jjSGdanB9+M9NQbyHIpIAMIomVnGmk85PPh/nupzMV/JY6ZleiXfic/D qZsGz558PvWajPxfAyVq4ahrwJRgv9dlqu1306n8OYA2VbS2xYOavInBL0rei35O8dXz FGkw== 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=aiSqEJkSBPlzl4bbihKgr31XObfhqG+fy9Jz9sUSAeuu+hMVhyYeadAUO/o6WVEcH5 QE0ke9C0hNX6RQETN8PgVioXi8aGhlxKcuAWkwWUbW9aAP+wKEyfKwvF8yWpXOyyDvZj z4Dn/XMxLvhMP0RJhMcUI1UiqkS61+xT8Ao4tAR/vtm0JqSt2S3jL1JxxbY9hXswMnPo 21iQYBMwNiyA7d7PU7MJA00fNOhL28zO1oOiR3Szjz0v67b0ImLm5yBeXQ3Hahd5LdoH Lt24ouEw4jmakb7pI1a4Po1j9PwPGsNTiFFkQrLibvigtwEtgK1JrqndwFwXB28A9cFe DhQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="FA5aun/X"; 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 f9-20020a1709063f4900b006df76385c66si13251042ejj.262.2022.03.23.04.04.38; Wed, 23 Mar 2022 04:04:38 -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="FA5aun/X"; 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 2186368B1E4; Wed, 23 Mar 2022 13:04:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8FFA968B17A for ; Wed, 23 Mar 2022 13:04:02 +0200 (EET) Received: by mail-qv1-f50.google.com with SMTP id k7so908197qvc.4 for ; Wed, 23 Mar 2022 04:04:02 -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=FA5aun/XnKZcUfn5iowD5NP+1HOBFtislzWLIn7VqTEYKmQr2XRVgtkqFwbiPZ9oFi tRtfqL5xXGruHdzW/pNpNhqEAQ6U03Y2Zlo0samhn6D3q5y2WOT6KUAmjuQKclqQG/zl im5gWVvdgkTnmUgbNDMbWlBrwRC69262ZrUTcr535HREAQT3UuynqMnCQY7TilXXnFPw g+UnX+hAVgoXUXRh9/819Yb6PNVJEFStL7xt7a0tVZN8pRZCp5J/9jyXWfsj5GI99V/I BM7T6VaqS804TQwRyUI7psZHheJFDUmzfHM0gngv4Z9+4tCppilYg/9EfwGQbPVTkJd9 xEEw== 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=0RyQt0QDR1FHw/GPC/opRnsPrHrs5nqULHphGfFGlG/GDWev1o/AnLyqLFnl0fijLY MYwaqKA4xV0BVXVDrFsqC5lAa3G0ZauIuazE2FZebr8sQ5ktbwUokB5fxP/Dfc+X0oAo ef1K3VSR0Ich0v9NkT/w20qJiJ5hkNPyhLO95nyUCZSnkjkjD6z0fzDPm793S8G6s8lK OEZMW3xEAqMr0xi5F9dscNu21AgkL6MeNs7UC2Rp0SfzSlXGQt3idizkRoN5sMvAKjNt DcCMZFvzYFWSI1WDFEf71Aox39hqlFz1zLukxgBw72SG7/ovK7pMmhZtoVv7+XOaCjy0 rCsQ== X-Gm-Message-State: AOAM533UiimDiH6P1OWHxr/3o1Z5Tip4XPmVyPVYt6sTQK+R4Io9qpd8 GbI6BR/nUqHJ8F7Eojc1p/2dBKK87yA= X-Received: by 2002:a05:6214:19c8:b0:441:4e6c:c6e with SMTP id j8-20020a05621419c800b004414e6c0c6emr4718399qvc.19.1648033441066; Wed, 23 Mar 2022 04:04:01 -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 s13-20020a05620a0bcd00b0067afe7dd3ffsm11012061qki.49.2022.03.23.04.04.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 04:04:00 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Mar 2022 07:03:24 -0400 Message-Id: <20220323110325.5499-4-leo.izen@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323110325.5499-1-leo.izen@gmail.com> References: <20220323110325.5499-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: rAPUJC1dpT7I 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, \