[FFmpeg-devel] [PATCH v4 2/4] avcodec/jpegxl_parser: add JPEG XL parser
Leo Izen
leo.izen at gmail.com
Mon Jun 26 18:49:20 EEST 2023
Add a parser to libavcodec for AV_CODEC_ID_JPEGXL. It doesn't find the
end of the stream in order to packetize the codec, but it does look at
the headers to set preliminary information like dimensions and pixel
format.
Note that much of this code is duplicated from avformat/jpegxl_probe.c,
but that code will be removed and call this instead in the next commit.
Signed-off-by: <leo.izen at gmail.com>
---
libavcodec/Makefile | 3 +
libavcodec/jpegxl.h | 72 ++++++
libavcodec/jpegxl_parse.c | 495 +++++++++++++++++++++++++++++++++++++
libavcodec/jpegxl_parse.h | 63 +++++
libavcodec/jpegxl_parser.c | 182 ++++++++++++++
libavcodec/parsers.c | 1 +
libavcodec/version.h | 2 +-
7 files changed, 817 insertions(+), 1 deletion(-)
create mode 100644 libavcodec/jpegxl.h
create mode 100644 libavcodec/jpegxl_parse.c
create mode 100644 libavcodec/jpegxl_parse.h
create mode 100644 libavcodec/jpegxl_parser.c
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0e4d27f37b..1a2e68e3e9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1055,6 +1055,8 @@ STLIBOBJS-$(CONFIG_AVFORMAT) += to_upper4.o
STLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o
STLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
STLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
+STLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
+STLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o
STLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o
STLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o
STLIBOBJS-$(CONFIG_MXF_MUXER) += golomb.o
@@ -1184,6 +1186,7 @@ OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o
OBJS-$(CONFIG_HDR_PARSER) += hdr_parser.o
OBJS-$(CONFIG_IPU_PARSER) += ipu_parser.o
OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o
+OBJS-$(CONFIG_JPEGXL_PARSER) += jpegxl_parser.o jpegxl_parse.o
OBJS-$(CONFIG_MISC4_PARSER) += misc4_parser.o
OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o
OBJS-$(CONFIG_MLP_PARSER) += mlp_parse.o mlp_parser.o mlp.o
diff --git a/libavcodec/jpegxl.h b/libavcodec/jpegxl.h
new file mode 100644
index 0000000000..d6faf1a8bd
--- /dev/null
+++ b/libavcodec/jpegxl.h
@@ -0,0 +1,72 @@
+/*
+ * JPEG XL Common Header Definitions
+ * Copyright (c) 2023 Leo Izen <leo.izen at gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_JPEGXL_H
+#define AVCODEC_JPEGXL_H
+
+#define FF_JPEGXL_CODESTREAM_SIGNATURE_LE 0x0aff
+#define FF_JPEGXL_CONTAINER_SIGNATURE_LE 0x204c584a0c000000
+
+typedef enum FFJXLExtraChannelType {
+ JPEGXL_CT_ALPHA = 0,
+ JPEGXL_CT_DEPTH,
+ JPEGXL_CT_SPOT_COLOR,
+ JPEGXL_CT_SELECTION_MASK,
+ JPEGXL_CT_BLACK,
+ JPEGXL_CT_CFA,
+ JPEGXL_CT_THERMAL,
+ JPEGXL_CT_NON_OPTIONAL = 15,
+ JPEGXL_CT_OPTIONAL
+} FFJXLExtraChannelType;
+
+typedef enum FFJXLColorSpace {
+ JPEGXL_CS_RGB = 0,
+ JPEGXL_CS_GRAY,
+ JPEGXL_CS_XYB,
+ JPEGXL_CS_UNKNOWN
+} FFJXLColorSpace;
+
+typedef enum FFJXLWhitePoint {
+ JPEGXL_WP_D65 = 1,
+ JPEGXL_WP_CUSTOM,
+ JPEGXL_WP_E = 10,
+ JPEGXL_WP_DCI = 11
+} FFJXLWhitePoint;
+
+typedef enum FFJXLPrimaries {
+ JPEGXL_PR_SRGB = 1,
+ JPEGXL_PR_CUSTOM,
+ JPEGXL_PR_2100 = 9,
+ JPEGXL_PR_P3 = 11,
+} FFJXLPrimaries;
+
+typedef enum FFJXLTransferCharacteristic {
+ JPEGXL_TR_BT709 = 1,
+ JPEGXL_TR_UNKNOWN,
+ JPEGXL_TR_LINEAR = 8,
+ JPEGXL_TR_SRGB = 13,
+ JPEGXL_TR_PQ = 16,
+ JPEGXL_TR_DCI,
+ JPEGXL_TR_HLG,
+ JPEGXL_TR_GAMMA = 1 << 24,
+} FFJXLTransferCharacteristic;
+
+#endif /* AVCODEC_JPEGXL_H */
diff --git a/libavcodec/jpegxl_parse.c b/libavcodec/jpegxl_parse.c
new file mode 100644
index 0000000000..023e6adf07
--- /dev/null
+++ b/libavcodec/jpegxl_parse.c
@@ -0,0 +1,495 @@
+/*
+ * JPEG XL Header Parser
+ * Copyright (c) 2023 Leo Izen <leo.izen at gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "bytestream.h"
+#define UNCHECKED_BITSTREAM_READER 0
+#define BITSTREAM_READER_LE
+#include "get_bits.h"
+#include "jpegxl.h"
+#include "jpegxl_parse.h"
+
+/* read a U32(c_i + u(u_i)) */
+static av_always_inline uint32_t jxl_u32(GetBitContext *gb,
+ uint32_t c0, uint32_t c1, uint32_t c2, uint32_t c3,
+ uint32_t u0, uint32_t u1, uint32_t u2, uint32_t u3)
+{
+ const uint32_t constants[4] = {c0, c1, c2, c3};
+ const uint32_t ubits [4] = {u0, u1, u2, u3};
+ uint32_t ret, choice = get_bits(gb, 2);
+
+ ret = constants[choice];
+ if (ubits[choice])
+ ret += get_bits_long(gb, ubits[choice]);
+
+ return ret;
+}
+
+static av_always_inline uint32_t jxl_enum(GetBitContext *gb)
+{
+ return jxl_u32(gb, 0, 1, 2, 18, 0, 0, 4, 6);
+}
+
+/* read a U64() */
+static uint64_t jpegxl_u64(GetBitContext *gb)
+{
+ uint64_t shift = 12, ret;
+
+ switch (get_bits(gb, 2)) {
+ case 1:
+ ret = 1 + get_bits(gb, 4);
+ break;
+ case 2:
+ ret = 17 + get_bits(gb, 8);
+ break;
+ case 3:
+ ret = get_bits(gb, 12);
+ while (get_bits1(gb)) {
+ if (shift < 60) {
+ ret |= (uint64_t)get_bits(gb, 8) << shift;
+ shift += 8;
+ } else {
+ ret |= (uint64_t)get_bits(gb, 4) << shift;
+ break;
+ }
+ }
+ break;
+ default:
+ ret = 0;
+ }
+
+ return ret;
+}
+
+static uint32_t jpegxl_width_from_ratio(uint32_t height, int ratio)
+{
+ uint64_t height64 = height; /* avoid integer overflow */
+ switch (ratio) {
+ case 1:
+ return height;
+ case 2:
+ return (uint32_t)((height64 * 12) / 10);
+ case 3:
+ return (uint32_t)((height64 * 4) / 3);
+ case 4:
+ return (uint32_t)((height64 * 3) / 2);
+ case 5:
+ return (uint32_t)((height64 * 16) / 9);
+ case 6:
+ return (uint32_t)((height64 * 5) / 4);
+ case 7:
+ return (uint32_t)(height64 * 2);
+ default:
+ break;
+ }
+
+ return 0; /* manual width */
+}
+
+/**
+ * validate a Jpeg XL Size Header
+ * @return >= 0 upon valid size, < 0 upon invalid size found
+ */
+static int jpegxl_read_size_header(GetBitContext *gb, FFJXLMetadata *meta)
+{
+ uint32_t width, height;
+
+ if (get_bits1(gb)) {
+ /* small size header */
+ height = (get_bits(gb, 5) + 1) << 3;
+ width = jpegxl_width_from_ratio(height, get_bits(gb, 3));
+ if (!width)
+ width = (get_bits(gb, 5) + 1) << 3;
+ } else {
+ /* large size header */
+ height = 1 + jxl_u32(gb, 0, 0, 0, 0, 9, 13, 18, 30);
+ width = jpegxl_width_from_ratio(height, get_bits(gb, 3));
+ if (!width)
+ width = 1 + jxl_u32(gb, 0, 0, 0, 0, 9, 13, 18, 30);
+ }
+ if (width > (1 << 18) || height > (1 << 18)
+ || (width >> 4) * (height >> 4) > (1 << 20))
+ return -1;
+
+ if (meta) {
+ meta->width = width;
+ meta->height = height;
+ }
+
+ return 0;
+}
+
+/**
+ * validate a Jpeg XL Preview Header
+ * @return >= 0 upon valid size, < 0 upon invalid size found
+ */
+static int jpegxl_read_preview_header(GetBitContext *gb)
+{
+ uint32_t width, height;
+
+ if (get_bits1(gb)) {
+ /* coded height and width divided by eight */
+ height = jxl_u32(gb, 16, 32, 1, 33, 0, 0, 5, 9) << 3;
+ width = jpegxl_width_from_ratio(height, get_bits(gb, 3));
+ if (!width)
+ width = jxl_u32(gb, 16, 32, 1, 33, 0, 0, 5, 9) << 3;
+ } else {
+ /* full height and width coded */
+ height = jxl_u32(gb, 1, 65, 321, 1345, 6, 8, 10, 12);
+ width = jpegxl_width_from_ratio(height, get_bits(gb, 3));
+ if (!width)
+ width = jxl_u32(gb, 1, 65, 321, 1345, 6, 8, 10, 12);
+ }
+ if (width > 4096 || height > 4096)
+ return -1;
+
+ return 0;
+}
+
+/**
+ * get a Jpeg XL BitDepth Header. These cannot be invalid.
+ */
+static void jpegxl_get_bit_depth(GetBitContext *gb, FFJXLMetadata *meta)
+{
+ int bit_depth;
+ if (get_bits1(gb)) {
+ /* float samples */
+ bit_depth = jxl_u32(gb, 32, 16, 24, 1, 0, 0, 0, 6); /* mantissa */
+ skip_bits_long(gb, 4); /* exponent */
+ } else {
+ /* integer samples */
+ bit_depth = jxl_u32(gb, 8, 10, 12, 1, 0, 0, 0, 6);
+ }
+ if (meta)
+ meta->bit_depth = bit_depth;
+}
+
+/**
+ * validate a Jpeg XL Extra Channel Info bundle
+ * @return >= 0 upon valid, < 0 upon invalid
+ */
+static int jpegxl_read_extra_channel_info(GetBitContext *gb, int validate_level, FFJXLMetadata *meta)
+{
+ int all_default = get_bits1(gb);
+ uint32_t type, name_len = 0;
+
+ if (!all_default) {
+ type = jxl_enum(gb);
+ if (type > 63)
+ return -1; /* enum types cannot be 64+ */
+ if (type == JPEGXL_CT_BLACK && validate_level)
+ return -1;
+ jpegxl_get_bit_depth(gb, NULL);
+ jxl_u32(gb, 0, 3, 4, 1, 0, 0, 0, 3); /* dim-shift */
+ /* max of name_len is 1071 = 48 + 2^10 - 1 */
+ name_len = jxl_u32(gb, 0, 0, 16, 48, 0, 4, 5, 10);
+ } else {
+ type = JPEGXL_CT_ALPHA;
+ }
+
+ /* skip over the name */
+ skip_bits_long(gb, 8 * name_len);
+
+ if (!all_default && type == JPEGXL_CT_ALPHA)
+ skip_bits1(gb);
+
+ if (type == JPEGXL_CT_SPOT_COLOR)
+ skip_bits_long(gb, 16 * 4);
+
+ if (type == JPEGXL_CT_CFA)
+ jxl_u32(gb, 1, 0, 3, 19, 0, 2, 4, 8);
+
+ if (meta && type == JPEGXL_CT_ALPHA)
+ meta->have_alpha = 1;
+
+ return 0;
+}
+
+int ff_jpegxl_parse_codestream_header(const uint8_t *buf, int buflen, int validate_level, FFJXLMetadata *meta)
+{
+ GetBitContext gbi, *gb = &gbi;
+ int all_default, extra_fields = 0;
+ int xyb_encoded = 1, have_icc_profile = 0;
+ int animation_offset = 0;
+ AVRational tb;
+ uint32_t num_extra_channels;
+ uint64_t extensions;
+ int ret;
+
+ ret = init_get_bits8(gb, buf, buflen);
+ if (ret < 0)
+ return ret;
+
+ if (get_bits_long(gb, 16) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE)
+ return -1;
+
+ ret = jpegxl_read_size_header(gb, meta);
+ if (ret < 0 && validate_level)
+ return ret;
+
+ all_default = get_bits1(gb);
+ if (!all_default)
+ extra_fields = get_bits1(gb);
+
+ if (extra_fields) {
+ int orientation = get_bits(gb, 3);
+ if (orientation > 3 && meta)
+ FFSWAP(uint32_t, meta->width, meta->height);
+
+ /*
+ * intrinstic size
+ * any size header here is valid, but as it
+ * is variable length we have to read it
+ */
+ if (get_bits1(gb))
+ jpegxl_read_size_header(gb, NULL);
+
+ /* preview header */
+ if (get_bits1(gb)) {
+ ret = jpegxl_read_preview_header(gb);
+ if (ret < 0)
+ return ret;
+ }
+
+ /* animation header */
+ if (get_bits1(gb)) {
+ animation_offset = get_bits_count(gb);
+ tb.den = jxl_u32(gb, 100, 1000, 1, 1, 0, 0, 10, 30);
+ tb.num = jxl_u32(gb, 1, 1001, 1, 1, 0, 0, 8, 10);
+ jxl_u32(gb, 0, 0, 0, 0, 0, 3, 16, 32);
+ skip_bits_long(gb, 1);
+ }
+ }
+
+ if (animation_offset && meta) {
+ meta->animation_offset = animation_offset;
+ meta->timebase = tb;
+ }
+
+ if (get_bits_left(gb) < 1)
+ return AVERROR_INVALIDDATA;
+
+ if (!all_default) {
+ jpegxl_get_bit_depth(gb, meta);
+
+ /* modular_16bit_buffers must equal 1 */
+ if (!get_bits1(gb) && validate_level)
+ return -1;
+
+ num_extra_channels = jxl_u32(gb, 0, 1, 2, 1, 0, 0, 4, 12);
+ if (num_extra_channels > 4 && validate_level)
+ return -1;
+ for (uint32_t i = 0; i < num_extra_channels; i++) {
+ ret = jpegxl_read_extra_channel_info(gb, validate_level, meta);
+ if (ret < 0)
+ return ret;
+ if (get_bits_left(gb) < 1)
+ return AVERROR_INVALIDDATA;
+ }
+
+ xyb_encoded = get_bits1(gb);
+
+ /* color encoding bundle */
+ if (!get_bits1(gb)) {
+ uint32_t color_space;
+ have_icc_profile = get_bits1(gb);
+ color_space = jxl_enum(gb);
+ if (color_space > 63)
+ return -1;
+ if (meta)
+ meta->csp = color_space;
+ if (!have_icc_profile) {
+ if (color_space != JPEGXL_CS_XYB) {
+ uint32_t white_point = jxl_enum(gb);
+ if (white_point > 63)
+ return -1;
+ if (meta)
+ meta->wp = white_point;
+ if (white_point == JPEGXL_WP_CUSTOM) {
+ /* ux and uy values */
+ jxl_u32(gb, 0, 524288, 1048576, 2097152, 19, 19, 20, 21);
+ jxl_u32(gb, 0, 524288, 1048576, 2097152, 19, 19, 20, 21);
+ }
+ if (color_space != JPEGXL_CS_GRAY) {
+ /* primaries */
+ uint32_t primaries = jxl_enum(gb);
+ if (primaries > 63)
+ return -1;
+ if (meta)
+ meta->primaries = primaries;
+ if (primaries == JPEGXL_PR_CUSTOM) {
+ /* ux/uy values for r,g,b */
+ for (int i = 0; i < 6; i++) {
+ jxl_u32(gb, 0, 524288, 1048576, 2097152, 19, 19, 20, 21);
+ if (get_bits_left(gb) < 1)
+ return AVERROR_INVALIDDATA;
+ }
+ }
+ }
+ }
+
+ /* transfer characteristics */
+ if (get_bits1(gb)) {
+ /* gamma */
+ uint32_t trc = get_bits(gb, 24);
+ if (meta)
+ meta->trc = trc;
+ } else {
+ /* transfer function */
+ uint32_t trc = jxl_enum(gb);
+ if (trc > 63)
+ return -1;
+ if (meta)
+ meta->trc = trc + (1U << 24);
+ }
+
+ /* rendering intent */
+ if (jxl_enum(gb) > 63)
+ return -1;
+ }
+ }
+
+ /* tone mapping bundle */
+ if (extra_fields && !get_bits1(gb))
+ skip_bits_long(gb, 16 + 16 + 1 + 16);
+
+ extensions = jpegxl_u64(gb);
+ if (get_bits_left(gb) < 1)
+ return AVERROR_INVALIDDATA;
+ if (extensions) {
+ for (int i = 0; i < 64; i++) {
+ if (extensions & (UINT64_C(1) << i))
+ jpegxl_u64(gb);
+ if (get_bits_left(gb) < 1)
+ return AVERROR_INVALIDDATA;
+ }
+ }
+ }
+
+ if (meta) {
+ if (!meta->bit_depth)
+ meta->bit_depth = 8;
+ if (!meta->csp)
+ meta->csp = JPEGXL_CS_RGB;
+ if (!meta->wp && !have_icc_profile)
+ meta->wp = JPEGXL_WP_D65;
+ if (!meta->primaries && !have_icc_profile)
+ meta->primaries = JPEGXL_PR_SRGB;
+ if (!meta->trc && !have_icc_profile)
+ meta->trc = JPEGXL_TR_SRGB + (1U << 24);
+ }
+
+ /* default transform */
+ if (!get_bits1(gb)) {
+ /* opsin inverse matrix */
+ if (xyb_encoded && !get_bits1(gb))
+ skip_bits_long(gb, 16 * 16);
+ /* cw_mask and default weights */
+ if (get_bits1(gb))
+ skip_bits_long(gb, 16 * 15);
+ if (get_bits1(gb))
+ skip_bits_long(gb, 16 * 55);
+ if (get_bits1(gb))
+ skip_bits_long(gb, 16 * 210);
+ }
+
+ if (!have_icc_profile) {
+ int bits_remaining = 7 - (get_bits_count(gb) - 1) % 8;
+ if (bits_remaining && get_bits(gb, bits_remaining))
+ return -1;
+ }
+
+ if (get_bits_left(gb) < 0)
+ return -1;
+
+ return 0;
+}
+
+/*
+ * copies as much of the codestream into the buffer as possible
+ * pass a shorter buflen to request less
+ * returns the number of bytes consumed from input, may be greater than input_len
+ * if the input doesn't end on an ISOBMFF-box boundary
+ */
+int ff_jpegxl_collect_codestream_header(const uint8_t *input_buffer, int input_len,
+ uint8_t *buffer, int buflen, int *copied)
+{
+ GetByteContext gb;
+ int pos = 0;
+ bytestream2_init(&gb, input_buffer, input_len);
+
+ while (1) {
+ uint64_t size;
+ uint32_t tag;
+ int head_size = 8;
+
+ if (bytestream2_get_bytes_left(&gb) < 16)
+ break;
+
+ size = bytestream2_get_be32(&gb);
+ if (size == 1) {
+ size = bytestream2_get_be64(&gb);
+ head_size = 16;
+ }
+ /* invalid ISOBMFF size */
+ if (size && size <= head_size)
+ return AVERROR_INVALIDDATA;
+ if (size)
+ size -= head_size;
+
+ tag = bytestream2_get_le32(&gb);
+ if (tag == MKTAG('j', 'x', 'l', 'p')) {
+ if (bytestream2_get_bytes_left(&gb) < 4)
+ break;
+ bytestream2_skip(&gb, 4);
+ if (size) {
+ if (size <= 4)
+ return AVERROR_INVALIDDATA;
+ size -= 4;
+ }
+ }
+ /*
+ * size = 0 means "until EOF". this is legal but uncommon
+ * here we just set it to the remaining size of the probe buffer
+ */
+ if (!size)
+ size = bytestream2_get_bytes_left(&gb);
+
+ pos += size + head_size;
+
+ if (tag == MKTAG('j', 'x', 'l', 'c') || tag == MKTAG('j', 'x', 'l', 'p')) {
+ if (size > buflen - *copied)
+ size = buflen - *copied;
+ /*
+ * arbitrary chunking of the payload makes this memcpy hard to avoid
+ * in practice this will only be performed one or two times at most
+ */
+ *copied += bytestream2_get_buffer(&gb, buffer + *copied, size);
+ } else {
+ bytestream2_skip(&gb, size);
+ }
+ if (bytestream2_get_bytes_left(&gb) <= 0 || *copied >= buflen)
+ break;
+ }
+
+ return pos;
+}
diff --git a/libavcodec/jpegxl_parse.h b/libavcodec/jpegxl_parse.h
new file mode 100644
index 0000000000..091e249d56
--- /dev/null
+++ b/libavcodec/jpegxl_parse.h
@@ -0,0 +1,63 @@
+/*
+ * JPEG XL Header Parser
+ * Copyright (c) 2023 Leo Izen <leo.izen at gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_JPEGXL_PARSE_H
+#define AVCODEC_JPEGXL_PARSE_H
+
+#include <stdint.h>
+
+#include "libavutil/rational.h"
+
+#include "jpegxl.h"
+
+typedef struct FFJXLMetadata {
+ uint32_t width;
+ uint32_t height;
+ int bit_depth;
+ int have_alpha;
+ /*
+ * offset, in bits, of the animation header
+ * zero if not animated
+ */
+ int animation_offset;
+ AVRational timebase;
+ FFJXLColorSpace csp;
+ FFJXLWhitePoint wp;
+ FFJXLPrimaries primaries;
+ FFJXLTransferCharacteristic trc;
+} FFJXLMetadata;
+
+/*
+ * copies as much of the codestream into the buffer as possible
+ * pass a shorter buflen to request less
+ * returns the number of bytes consumed from input, may be greater than input_len
+ * if the input doesn't end on an ISOBMFF-box boundary
+ */
+int ff_jpegxl_collect_codestream_header(const uint8_t *input_buffer, int input_len,
+ uint8_t *buffer, int buflen, int *copied);
+
+/*
+ * Parse the codestream header with the provided buffer. Returns negative upon failure,
+ * zero upon success. The FFJXLMetadata parameter may be NULL, in which case it's ignored.
+ */
+int ff_jpegxl_parse_codestream_header(const uint8_t *buf, int buflen, int validate_level, FFJXLMetadata *meta);
+
+#endif /* AVCODEC_JPEGXL_PARSE_H */
diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c
new file mode 100644
index 0000000000..30599d1ae1
--- /dev/null
+++ b/libavcodec/jpegxl_parser.c
@@ -0,0 +1,182 @@
+/*
+ * JPEG XL Codec Parser
+ * Copyright (c) 2023 Leo Izen <leo.izen at gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/intreadwrite.h"
+
+#include "codec_id.h"
+#include "jpegxl.h"
+#include "jpegxl_parse.h"
+#include "parser.h"
+
+typedef struct JXLParseContext {
+ FFJXLMetadata meta;
+ int parsed_header;
+ int container;
+ uint8_t codestream_header[4096];
+ int copied;
+ int skip;
+} JXLParseContext;
+
+static void populate_fields(AVCodecParserContext *s, AVCodecContext *avctx, JXLParseContext *ctx)
+{
+ s->width = ctx->meta.width;
+ s->height = ctx->meta.height;
+
+ switch (ctx->meta.csp) {
+ case JPEGXL_CS_RGB:
+ case JPEGXL_CS_XYB:
+ avctx->colorspace = AVCOL_SPC_RGB;
+ break;
+ default:
+ avctx->colorspace = AVCOL_SPC_UNSPECIFIED;
+ }
+
+ if (ctx->meta.wp == JPEGXL_WP_D65) {
+ switch (ctx->meta.primaries) {
+ case JPEGXL_PR_SRGB:
+ avctx->color_primaries = AVCOL_PRI_BT709;
+ break;
+ case JPEGXL_PR_P3:
+ avctx->color_primaries = AVCOL_PRI_SMPTE432;
+ break;
+ case JPEGXL_PR_2100:
+ avctx->color_primaries = AVCOL_PRI_BT2020;
+ break;
+ default:
+ avctx->color_primaries = AVCOL_PRI_UNSPECIFIED;
+ }
+ } else if (ctx->meta.wp == JPEGXL_WP_DCI && ctx->meta.primaries == JPEGXL_PR_P3) {
+ avctx->color_primaries = AVCOL_PRI_SMPTE431;
+ } else {
+ avctx->color_primaries = AVCOL_PRI_UNSPECIFIED;
+ }
+
+ if (ctx->meta.trc > JPEGXL_TR_GAMMA) {
+ FFJXLTransferCharacteristic trc = ctx->meta.trc - JPEGXL_TR_GAMMA;
+ switch (trc) {
+ case JPEGXL_TR_BT709:
+ avctx->color_trc = AVCOL_TRC_BT709;
+ break;
+ case JPEGXL_TR_LINEAR:
+ avctx->color_trc = AVCOL_TRC_LINEAR;
+ break;
+ case JPEGXL_TR_SRGB:
+ avctx->color_trc = AVCOL_TRC_IEC61966_2_1;
+ break;
+ case JPEGXL_TR_PQ:
+ avctx->color_trc = AVCOL_TRC_SMPTEST2084;
+ break;
+ case JPEGXL_TR_DCI:
+ avctx->color_trc = AVCOL_TRC_SMPTE428;
+ break;
+ case JPEGXL_TR_HLG:
+ avctx->color_trc = AVCOL_TRC_ARIB_STD_B67;
+ break;
+ default:
+ avctx->color_trc = AVCOL_TRC_UNSPECIFIED;
+ }
+ } else if (ctx->meta.trc > 0) {
+ if (ctx->meta.trc > 45355 && ctx->meta.trc < 45555)
+ avctx->color_trc = AVCOL_TRC_GAMMA22;
+ else if (ctx->meta.trc > 35614 && ctx->meta.trc < 35814)
+ avctx->color_trc = AVCOL_TRC_GAMMA28;
+ else
+ avctx->color_trc = AVCOL_TRC_UNSPECIFIED;
+ } else {
+ avctx->color_trc = AVCOL_TRC_UNSPECIFIED;
+ }
+
+ if (ctx->meta.csp == JPEGXL_CS_GRAY) {
+ if (ctx->meta.bit_depth <= 8)
+ avctx->pix_fmt = s->format = ctx->meta.have_alpha ? AV_PIX_FMT_YA8 : AV_PIX_FMT_GRAY8;
+ else if (ctx->meta.bit_depth <= 16)
+ avctx->pix_fmt = s->format = ctx->meta.have_alpha ? AV_PIX_FMT_YA16 : AV_PIX_FMT_GRAY16;
+ else
+ avctx->pix_fmt = s->format = ctx->meta.have_alpha ? AV_PIX_FMT_NONE : AV_PIX_FMT_GRAYF32;
+ } else {
+ if (ctx->meta.bit_depth <= 8)
+ avctx->pix_fmt = s->format = ctx->meta.have_alpha ? AV_PIX_FMT_RGBA : AV_PIX_FMT_RGB24;
+ else if (ctx->meta.bit_depth <= 16)
+ avctx->pix_fmt = s->format = ctx->meta.have_alpha ? AV_PIX_FMT_RGBA64 : AV_PIX_FMT_RGB48;
+ else
+ avctx->pix_fmt = s->format = ctx->meta.have_alpha ? AV_PIX_FMT_RGBAF32 : AV_PIX_FMT_RGBF32;
+ }
+}
+
+static int jpegxl_parse(AVCodecParserContext *s, AVCodecContext *avctx,
+ const uint8_t **poutbuf, int *poutbuf_size,
+ const uint8_t *buf, int buf_size)
+{
+ JXLParseContext *ctx = s->priv_data;
+ int ret;
+
+ *poutbuf = NULL;
+ *poutbuf_size = 0;
+
+ if (!ctx->parsed_header) {
+ if (ctx->container || AV_RL64(buf) == FF_JPEGXL_CONTAINER_SIGNATURE_LE) {
+ ctx->container = 1;
+ if (ctx->copied) {
+ int copy = FFMIN3(buf_size, ctx->skip, sizeof(ctx->codestream_header) - ctx->copied);
+ if (copy > 0) {
+ memcpy(ctx->codestream_header + ctx->copied, buf, copy);
+ ctx->copied += copy;
+ } else {
+ ctx->parsed_header = 1;
+ }
+ } else {
+ if (ctx->skip > buf_size) {
+ ctx->skip -= buf_size;
+ } else {
+ ret = ff_jpegxl_collect_codestream_header(buf + ctx->skip, buf_size - ctx->skip,
+ ctx->codestream_header, sizeof(ctx->codestream_header),
+ &ctx->copied);
+ if (ret < 0)
+ ctx->parsed_header = 1;
+ ctx->skip = FFMAX(0, ret - (buf_size - ctx->skip));
+ }
+ }
+ if (ctx->copied) {
+ ret = ff_jpegxl_parse_codestream_header(ctx->codestream_header, ctx->copied, 0, &ctx->meta);
+ if (ret >= 0) {
+ populate_fields(s, avctx, ctx);
+ ctx->parsed_header = 1;
+ }
+ }
+ } else {
+ ret = ff_jpegxl_parse_codestream_header(buf, buf_size, 1, &ctx->meta);
+ if (ret >= 0)
+ populate_fields(s, avctx, ctx);
+ ctx->parsed_header = 1;
+ }
+ }
+
+ *poutbuf = buf;
+ *poutbuf_size = buf_size;
+
+ return buf_size;
+}
+
+const AVCodecParser ff_jpegxl_parser = {
+ .codec_ids = { AV_CODEC_ID_JPEGXL },
+ .priv_data_size = sizeof(JXLParseContext),
+ .parser_parse = jpegxl_parse,
+};
diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c
index 2c077ec3ae..aa2d0b0122 100644
--- a/libavcodec/parsers.c
+++ b/libavcodec/parsers.c
@@ -55,6 +55,7 @@ extern const AVCodecParser ff_hevc_parser;
extern const AVCodecParser ff_hdr_parser;
extern const AVCodecParser ff_ipu_parser;
extern const AVCodecParser ff_jpeg2000_parser;
+extern const AVCodecParser ff_jpegxl_parser;
extern const AVCodecParser ff_misc4_parser;
extern const AVCodecParser ff_mjpeg_parser;
extern const AVCodecParser ff_mlp_parser;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index da6f3a84ac..9411511e04 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#include "version_major.h"
-#define LIBAVCODEC_VERSION_MINOR 21
+#define LIBAVCODEC_VERSION_MINOR 22
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
--
2.41.0
More information about the ffmpeg-devel
mailing list