* [FFmpeg-devel] [PATCH v4 1/4] avcodec/libjxldec: use internal AVFrame as buffered space
2023-06-26 15:49 [FFmpeg-devel] [PATCH v4 0/4] JPEG XL Parser Leo Izen
@ 2023-06-26 15:49 ` Leo Izen
2023-06-27 20:08 ` Andreas Rheinhardt
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 2/4] avcodec/jpegxl_parser: add JPEG XL parser Leo Izen
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Leo Izen @ 2023-06-26 15:49 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Leo Izen
Before this commit, the decoder erroneously assumes that the AVFrame
passed to the receive_frame is the same one each time. Now it keeps an
internal AVFrame to write into, and copies it over when it's done.
---
libavcodec/libjxldec.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c
index 50417bcb02..e516c29be5 100644
--- a/libavcodec/libjxldec.c
+++ b/libavcodec/libjxldec.c
@@ -58,6 +58,7 @@ typedef struct LibJxlDecodeContext {
int64_t frame_duration;
int prev_is_last;
AVRational timebase;
+ AVFrame *frame;
} LibJxlDecodeContext;
static int libjxl_init_jxl_decoder(AVCodecContext *avctx)
@@ -104,6 +105,9 @@ static av_cold int libjxl_decode_init(AVCodecContext *avctx)
ctx->avpkt = avctx->internal->in_pkt;
ctx->pts = 0;
+ ctx->frame = av_frame_alloc();
+ if (!ctx->frame)
+ return AVERROR(ENOMEM);
return libjxl_init_jxl_decoder(avctx);
}
@@ -351,10 +355,12 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
size_t remaining;
if (!pkt->size) {
+ av_log(avctx, AV_LOG_DEBUG, "Fetching new packet\n");
av_packet_unref(pkt);
ret = ff_decode_get_packet(avctx, pkt);
if (ret < 0 && ret != AVERROR_EOF)
return ret;
+ av_log(avctx, AV_LOG_DEBUG, "Fetched packet of size: %d\n", pkt->size);
if (!pkt->size) {
/* jret set by the last iteration of the loop */
if (jret == JXL_DEC_NEED_MORE_INPUT) {
@@ -389,10 +395,6 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
return AVERROR_INVALIDDATA;
case JXL_DEC_NEED_MORE_INPUT:
av_log(avctx, AV_LOG_DEBUG, "NEED_MORE_INPUT event emitted\n");
- if (!pkt->size) {
- av_packet_unref(pkt);
- return AVERROR(EAGAIN);
- }
continue;
case JXL_DEC_BASIC_INFO:
av_log(avctx, AV_LOG_DEBUG, "BASIC_INFO event emitted\n");
@@ -421,16 +423,18 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
continue;
case JXL_DEC_COLOR_ENCODING:
av_log(avctx, AV_LOG_DEBUG, "COLOR_ENCODING event emitted\n");
- if ((ret = libjxl_color_encoding_event(avctx, frame)) < 0)
+ if ((ret = libjxl_color_encoding_event(avctx, ctx->frame)) < 0)
return ret;
continue;
case JXL_DEC_NEED_IMAGE_OUT_BUFFER:
av_log(avctx, AV_LOG_DEBUG, "NEED_IMAGE_OUT_BUFFER event emitted\n");
- if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+ ret = ff_get_buffer(avctx, ctx->frame, 0);
+ if (ret < 0)
return ret;
- ctx->jxl_pixfmt.align = frame->linesize[0];
- if (JxlDecoderSetImageOutBuffer(ctx->decoder, &ctx->jxl_pixfmt, frame->data[0], frame->buf[0]->size)
- != JXL_DEC_SUCCESS) {
+ ctx->jxl_pixfmt.align = ctx->frame->linesize[0];
+ if (JxlDecoderSetImageOutBuffer(ctx->decoder, &ctx->jxl_pixfmt,
+ ctx->frame->data[0], ctx->frame->buf[0]->size)
+ != JXL_DEC_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Bad libjxl dec need image out buffer event\n");
return AVERROR_EXTERNAL;
}
@@ -444,8 +448,8 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
case JXL_DEC_FRAME:
av_log(avctx, AV_LOG_DEBUG, "FRAME event emitted\n");
if (!ctx->basic_info.have_animation || ctx->prev_is_last) {
- frame->pict_type = AV_PICTURE_TYPE_I;
- frame->flags |= AV_FRAME_FLAG_KEY;
+ ctx->frame->pict_type = AV_PICTURE_TYPE_I;
+ ctx->frame->flags |= AV_FRAME_FLAG_KEY;
}
if (ctx->basic_info.have_animation) {
JxlFrameHeader header;
@@ -464,20 +468,21 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
/* full image is one frame, even if animated */
av_log(avctx, AV_LOG_DEBUG, "FULL_IMAGE event emitted\n");
if (ctx->iccp) {
- AVFrameSideData *sd = av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_ICC_PROFILE, ctx->iccp);
+ AVFrameSideData *sd = av_frame_new_side_data_from_buf(ctx->frame, AV_FRAME_DATA_ICC_PROFILE, ctx->iccp);
if (!sd)
return AVERROR(ENOMEM);
/* ownership is transfered, and it is not ref-ed */
ctx->iccp = NULL;
}
if (avctx->pkt_timebase.num) {
- frame->pts = av_rescale_q(ctx->pts, ctx->timebase, avctx->pkt_timebase);
- frame->duration = av_rescale_q(ctx->frame_duration, ctx->timebase, avctx->pkt_timebase);
+ ctx->frame->pts = av_rescale_q(ctx->pts, ctx->timebase, avctx->pkt_timebase);
+ ctx->frame->duration = av_rescale_q(ctx->frame_duration, ctx->timebase, avctx->pkt_timebase);
} else {
- frame->pts = ctx->pts;
- frame->duration = ctx->frame_duration;
+ ctx->frame->pts = ctx->pts;
+ ctx->frame->duration = ctx->frame_duration;
}
ctx->pts += ctx->frame_duration;
+ av_frame_move_ref(frame, ctx->frame);
return 0;
case JXL_DEC_SUCCESS:
av_log(avctx, AV_LOG_DEBUG, "SUCCESS event emitted\n");
@@ -508,6 +513,7 @@ static av_cold int libjxl_decode_close(AVCodecContext *avctx)
JxlDecoderDestroy(ctx->decoder);
ctx->decoder = NULL;
av_buffer_unref(&ctx->iccp);
+ av_frame_free(&ctx->frame);
return 0;
}
--
2.41.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [FFmpeg-devel] [PATCH v4 1/4] avcodec/libjxldec: use internal AVFrame as buffered space
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 1/4] avcodec/libjxldec: use internal AVFrame as buffered space Leo Izen
@ 2023-06-27 20:08 ` Andreas Rheinhardt
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Rheinhardt @ 2023-06-27 20:08 UTC (permalink / raw)
To: ffmpeg-devel
Leo Izen:
> Before this commit, the decoder erroneously assumes that the AVFrame
> passed to the receive_frame is the same one each time. Now it keeps an
> internal AVFrame to write into, and copies it over when it's done.
> ---
> libavcodec/libjxldec.c | 38 ++++++++++++++++++++++----------------
> 1 file changed, 22 insertions(+), 16 deletions(-)
>
> diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c
> index 50417bcb02..e516c29be5 100644
> --- a/libavcodec/libjxldec.c
> +++ b/libavcodec/libjxldec.c
> @@ -58,6 +58,7 @@ typedef struct LibJxlDecodeContext {
> int64_t frame_duration;
> int prev_is_last;
> AVRational timebase;
> + AVFrame *frame;
> } LibJxlDecodeContext;
>
> static int libjxl_init_jxl_decoder(AVCodecContext *avctx)
> @@ -104,6 +105,9 @@ static av_cold int libjxl_decode_init(AVCodecContext *avctx)
>
> ctx->avpkt = avctx->internal->in_pkt;
> ctx->pts = 0;
> + ctx->frame = av_frame_alloc();
> + if (!ctx->frame)
> + return AVERROR(ENOMEM);
>
> return libjxl_init_jxl_decoder(avctx);
> }
> @@ -351,10 +355,12 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
> size_t remaining;
>
> if (!pkt->size) {
> + av_log(avctx, AV_LOG_DEBUG, "Fetching new packet\n");
> av_packet_unref(pkt);
> ret = ff_decode_get_packet(avctx, pkt);
> if (ret < 0 && ret != AVERROR_EOF)
> return ret;
> + av_log(avctx, AV_LOG_DEBUG, "Fetched packet of size: %d\n", pkt->size);
These logs have nothing to do with what the patch is supposed to do (and
they would belong in ff_decode_get_packet() anyway instead of in a
single user).
> if (!pkt->size) {
> /* jret set by the last iteration of the loop */
> if (jret == JXL_DEC_NEED_MORE_INPUT) {
> @@ -389,10 +395,6 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
> return AVERROR_INVALIDDATA;
> case JXL_DEC_NEED_MORE_INPUT:
> av_log(avctx, AV_LOG_DEBUG, "NEED_MORE_INPUT event emitted\n");
> - if (!pkt->size) {
> - av_packet_unref(pkt);
> - return AVERROR(EAGAIN);
> - }
> continue;
> case JXL_DEC_BASIC_INFO:
> av_log(avctx, AV_LOG_DEBUG, "BASIC_INFO event emitted\n");
> @@ -421,16 +423,18 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
> continue;
> case JXL_DEC_COLOR_ENCODING:
> av_log(avctx, AV_LOG_DEBUG, "COLOR_ENCODING event emitted\n");
> - if ((ret = libjxl_color_encoding_event(avctx, frame)) < 0)
> + if ((ret = libjxl_color_encoding_event(avctx, ctx->frame)) < 0)
> return ret;
> continue;
> case JXL_DEC_NEED_IMAGE_OUT_BUFFER:
> av_log(avctx, AV_LOG_DEBUG, "NEED_IMAGE_OUT_BUFFER event emitted\n");
> - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
> + ret = ff_get_buffer(avctx, ctx->frame, 0);
> + if (ret < 0)
> return ret;
> - ctx->jxl_pixfmt.align = frame->linesize[0];
> - if (JxlDecoderSetImageOutBuffer(ctx->decoder, &ctx->jxl_pixfmt, frame->data[0], frame->buf[0]->size)
> - != JXL_DEC_SUCCESS) {
> + ctx->jxl_pixfmt.align = ctx->frame->linesize[0];
> + if (JxlDecoderSetImageOutBuffer(ctx->decoder, &ctx->jxl_pixfmt,
> + ctx->frame->data[0], ctx->frame->buf[0]->size)
> + != JXL_DEC_SUCCESS) {
> av_log(avctx, AV_LOG_ERROR, "Bad libjxl dec need image out buffer event\n");
> return AVERROR_EXTERNAL;
> }
> @@ -444,8 +448,8 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
> case JXL_DEC_FRAME:
> av_log(avctx, AV_LOG_DEBUG, "FRAME event emitted\n");
> if (!ctx->basic_info.have_animation || ctx->prev_is_last) {
> - frame->pict_type = AV_PICTURE_TYPE_I;
> - frame->flags |= AV_FRAME_FLAG_KEY;
> + ctx->frame->pict_type = AV_PICTURE_TYPE_I;
> + ctx->frame->flags |= AV_FRAME_FLAG_KEY;
> }
> if (ctx->basic_info.have_animation) {
> JxlFrameHeader header;
> @@ -464,20 +468,21 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame)
> /* full image is one frame, even if animated */
> av_log(avctx, AV_LOG_DEBUG, "FULL_IMAGE event emitted\n");
> if (ctx->iccp) {
> - AVFrameSideData *sd = av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_ICC_PROFILE, ctx->iccp);
> + AVFrameSideData *sd = av_frame_new_side_data_from_buf(ctx->frame, AV_FRAME_DATA_ICC_PROFILE, ctx->iccp);
> if (!sd)
> return AVERROR(ENOMEM);
> /* ownership is transfered, and it is not ref-ed */
> ctx->iccp = NULL;
> }
> if (avctx->pkt_timebase.num) {
> - frame->pts = av_rescale_q(ctx->pts, ctx->timebase, avctx->pkt_timebase);
> - frame->duration = av_rescale_q(ctx->frame_duration, ctx->timebase, avctx->pkt_timebase);
> + ctx->frame->pts = av_rescale_q(ctx->pts, ctx->timebase, avctx->pkt_timebase);
> + ctx->frame->duration = av_rescale_q(ctx->frame_duration, ctx->timebase, avctx->pkt_timebase);
> } else {
> - frame->pts = ctx->pts;
> - frame->duration = ctx->frame_duration;
> + ctx->frame->pts = ctx->pts;
> + ctx->frame->duration = ctx->frame_duration;
> }
> ctx->pts += ctx->frame_duration;
> + av_frame_move_ref(frame, ctx->frame);
> return 0;
> case JXL_DEC_SUCCESS:
> av_log(avctx, AV_LOG_DEBUG, "SUCCESS event emitted\n");
> @@ -508,6 +513,7 @@ static av_cold int libjxl_decode_close(AVCodecContext *avctx)
> JxlDecoderDestroy(ctx->decoder);
> ctx->decoder = NULL;
> av_buffer_unref(&ctx->iccp);
> + av_frame_free(&ctx->frame);
>
> return 0;
> }
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread
* [FFmpeg-devel] [PATCH v4 2/4] avcodec/jpegxl_parser: add JPEG XL parser
2023-06-26 15:49 [FFmpeg-devel] [PATCH v4 0/4] JPEG XL Parser Leo Izen
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 1/4] avcodec/libjxldec: use internal AVFrame as buffered space Leo Izen
@ 2023-06-26 15:49 ` Leo Izen
2023-06-27 22:58 ` James Almer
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 3/4] avformat/jpegxl: remove jpegxl_probe, instead call avcodec/jpegxl_parse Leo Izen
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 4/4] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim Leo Izen
3 siblings, 1 reply; 13+ messages in thread
From: Leo Izen @ 2023-06-26 15:49 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Leo Izen
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@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@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@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@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@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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [FFmpeg-devel] [PATCH v4 2/4] avcodec/jpegxl_parser: add JPEG XL parser
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 2/4] avcodec/jpegxl_parser: add JPEG XL parser Leo Izen
@ 2023-06-27 22:58 ` James Almer
2023-06-27 23:18 ` Leo Izen
0 siblings, 1 reply; 13+ messages in thread
From: James Almer @ 2023-06-27 22:58 UTC (permalink / raw)
To: ffmpeg-devel
On 6/26/2023 12:49 PM, Leo Izen wrote:
> +/*
> + * 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;
ISOBMFF? Are you propagating container bytes as if they were part of the
bitstream from image2? Why is it not being handled by the mov/mp4
demuxer instead?
> + 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;
Again, don't fill avctx->pix_fmt, fill s->format.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [FFmpeg-devel] [PATCH v4 2/4] avcodec/jpegxl_parser: add JPEG XL parser
2023-06-27 22:58 ` James Almer
@ 2023-06-27 23:18 ` Leo Izen
2023-06-27 23:20 ` James Almer
0 siblings, 1 reply; 13+ messages in thread
From: Leo Izen @ 2023-06-27 23:18 UTC (permalink / raw)
To: ffmpeg-devel
On 6/27/23 18:58, James Almer wrote:
> On 6/26/2023 12:49 PM, Leo Izen wrote:
>> +/*
>> + * 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;
>
> ISOBMFF? Are you propagating container bytes as if they were part of the
> bitstream from image2? Why is it not being handled by the mov/mp4
> demuxer instead?
It's not actually ISOBMFF, it just uses the same style of box layout.
This is also how j2k works.
>
>> + 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;
>
> Again, don't fill avctx->pix_fmt, fill s->format.
> _______________________________________________
If I don't fill this, the CLI will not show the pixel format without the
external decoder library enabled. Should I consider this an ffmpeg.c bug?
- Leo Izen
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [FFmpeg-devel] [PATCH v4 2/4] avcodec/jpegxl_parser: add JPEG XL parser
2023-06-27 23:18 ` Leo Izen
@ 2023-06-27 23:20 ` James Almer
0 siblings, 0 replies; 13+ messages in thread
From: James Almer @ 2023-06-27 23:20 UTC (permalink / raw)
To: ffmpeg-devel
On 6/27/2023 8:18 PM, Leo Izen wrote:
> On 6/27/23 18:58, James Almer wrote:
>> On 6/26/2023 12:49 PM, Leo Izen wrote:
>>> +/*
>>> + * 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;
>>
>> ISOBMFF? Are you propagating container bytes as if they were part of
>> the bitstream from image2? Why is it not being handled by the mov/mp4
>> demuxer instead?
>
> It's not actually ISOBMFF, it just uses the same style of box layout.
> This is also how j2k works.
Ok.
>
>>
>>> + 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;
>>
>> Again, don't fill avctx->pix_fmt, fill s->format.
>> _______________________________________________
>
> If I don't fill this, the CLI will not show the pixel format without the
> external decoder library enabled. Should I consider this an ffmpeg.c bug?
That's expected, and it's not a bug. A given decoder can and many times
disagrees with the parser. In an scenario without a decoder, remuxing
still works as pix_fmt is not a container level parameter.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread
* [FFmpeg-devel] [PATCH v4 3/4] avformat/jpegxl: remove jpegxl_probe, instead call avcodec/jpegxl_parse
2023-06-26 15:49 [FFmpeg-devel] [PATCH v4 0/4] JPEG XL Parser Leo Izen
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 1/4] avcodec/libjxldec: use internal AVFrame as buffered space Leo Izen
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 2/4] avcodec/jpegxl_parser: add JPEG XL parser Leo Izen
@ 2023-06-26 15:49 ` Leo Izen
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 4/4] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim Leo Izen
3 siblings, 0 replies; 13+ messages in thread
From: Leo Izen @ 2023-06-26 15:49 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Leo Izen
This prevents code duplication in the source form by calling the parse
code that was moved to avcodec last commit. The code will be duplicated
in binary form for shared builds (it's not that large), but for source
code it will only exist in one location now.
Signed-off-by: <leo.izen@gmail.com>
---
libavformat/Makefile | 6 +-
libavformat/img2dec.c | 4 +-
libavformat/jpegxl_anim_dec.c | 114 +----
.../{jpegxl_probe.h => jpegxl_parse.c} | 21 +-
libavformat/jpegxl_probe.c | 412 ------------------
5 files changed, 29 insertions(+), 528 deletions(-)
rename libavformat/{jpegxl_probe.h => jpegxl_parse.c} (55%)
delete mode 100644 libavformat/jpegxl_probe.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2b90b788c0..48e1e8ea04 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -283,7 +283,7 @@ OBJS-$(CONFIG_IMAGE_HDR_PIPE_DEMUXER) += img2dec.o img2.o
OBJS-$(CONFIG_IMAGE_J2K_PIPE_DEMUXER) += img2dec.o img2.o
OBJS-$(CONFIG_IMAGE_JPEG_PIPE_DEMUXER) += img2dec.o img2.o
OBJS-$(CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER) += img2dec.o img2.o
-OBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += img2dec.o img2.o jpegxl_probe.o
+OBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += img2dec.o img2.o jpegxl_parse.o
OBJS-$(CONFIG_IMAGE_PAM_PIPE_DEMUXER) += img2dec.o img2.o
OBJS-$(CONFIG_IMAGE_PBM_PIPE_DEMUXER) += img2dec.o img2.o
OBJS-$(CONFIG_IMAGE_PCX_PIPE_DEMUXER) += img2dec.o img2.o
@@ -320,7 +320,7 @@ OBJS-$(CONFIG_IVF_MUXER) += ivfenc.o
OBJS-$(CONFIG_IVR_DEMUXER) += rmdec.o rm.o rmsipr.o
OBJS-$(CONFIG_JACOSUB_DEMUXER) += jacosubdec.o subtitles.o
OBJS-$(CONFIG_JACOSUB_MUXER) += jacosubenc.o rawenc.o
-OBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_anim_dec.o jpegxl_probe.o
+OBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_anim_dec.o jpegxl_parse.o
OBJS-$(CONFIG_JV_DEMUXER) += jvdec.o
OBJS-$(CONFIG_KUX_DEMUXER) += flvdec.o
OBJS-$(CONFIG_KVAG_DEMUXER) += kvag.o
@@ -715,6 +715,8 @@ SHLIBOBJS += log2_tab.o to_upper4.o
SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o
SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
+SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
+SHLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o
SHLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o
SHLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o
SHLIBOBJS-$(CONFIG_MP3_MUXER) += mpegaudiotabs.o
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index b986d3a502..72b2c76405 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -36,7 +36,7 @@
#include "avio_internal.h"
#include "internal.h"
#include "img2.h"
-#include "jpegxl_probe.h"
+#include "libavcodec/jpegxl_parse.h"
#include "libavcodec/mjpeg.h"
#include "libavcodec/vbn.h"
#include "libavcodec/xwd.h"
@@ -850,7 +850,7 @@ static int jpegxl_probe(const AVProbeData *p)
if (AV_RL16(b) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE)
return 0;
#if CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER
- if (ff_jpegxl_verify_codestream_header(p->buf, p->buf_size, 1) >= 0)
+ if (ff_jpegxl_parse_codestream_header(p->buf, p->buf_size, 1, NULL) >= 0)
return AVPROBE_SCORE_MAX - 2;
#endif
return 0;
diff --git a/libavformat/jpegxl_anim_dec.c b/libavformat/jpegxl_anim_dec.c
index 956b56c1d8..b178b74ff0 100644
--- a/libavformat/jpegxl_anim_dec.c
+++ b/libavformat/jpegxl_anim_dec.c
@@ -28,96 +28,28 @@
#include <stdint.h>
#include <string.h>
-#include "libavcodec/bytestream.h"
-#define BITSTREAM_READER_LE
-#include "libavcodec/get_bits.h"
-
+#include "libavcodec/jpegxl.h"
+#include "libavcodec/jpegxl_parse.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#include "avformat.h"
#include "internal.h"
-#include "jpegxl_probe.h"
typedef struct JXLAnimDemuxContext {
AVBufferRef *initial;
} JXLAnimDemuxContext;
-/*
- * 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
- */
-static int jpegxl_collect_codestream_header(const uint8_t *input_buffer, int input_len,
- uint8_t *buffer, int buflen, int *copied) {
- GetByteContext gb;
- *copied = 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);
-
- 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 bytestream2_tell(&gb);
-}
-
static int jpegxl_anim_probe(const AVProbeData *p)
{
uint8_t buffer[4096 + AV_INPUT_BUFFER_PADDING_SIZE];
- int copied;
+ int copied = 0, ret;
+ FFJXLMetadata meta = { 0 };
/* this is a raw codestream */
if (AV_RL16(p->buf) == FF_JPEGXL_CODESTREAM_SIGNATURE_LE) {
- if (ff_jpegxl_verify_codestream_header(p->buf, p->buf_size, 1) >= 1)
+ ret = ff_jpegxl_parse_codestream_header(p->buf, p->buf_size, 1, &meta);
+ if (ret >= 0 && meta.animation_offset > 0)
return AVPROBE_SCORE_MAX;
return 0;
@@ -127,10 +59,13 @@ static int jpegxl_anim_probe(const AVProbeData *p)
if (AV_RL64(p->buf) != FF_JPEGXL_CONTAINER_SIGNATURE_LE)
return 0;
- if (jpegxl_collect_codestream_header(p->buf, p->buf_size, buffer, sizeof(buffer) - AV_INPUT_BUFFER_PADDING_SIZE, &copied) <= 0 || copied <= 0)
+ if (ff_jpegxl_collect_codestream_header(p->buf, p->buf_size, buffer,
+ sizeof(buffer) - AV_INPUT_BUFFER_PADDING_SIZE, &copied) <= 0
+ || copied <= 0)
return 0;
- if (ff_jpegxl_verify_codestream_header(buffer, copied, 0) >= 1)
+ ret = ff_jpegxl_parse_codestream_header(buffer, copied, 0, &meta);
+ if (ret >= 0 && meta.animation_offset > 0)
return AVPROBE_SCORE_MAX;
return 0;
@@ -141,13 +76,10 @@ static int jpegxl_anim_read_header(AVFormatContext *s)
JXLAnimDemuxContext *ctx = s->priv_data;
AVIOContext *pb = s->pb;
AVStream *st;
- int offset = 0;
uint8_t head[256 + AV_INPUT_BUFFER_PADDING_SIZE];
const int sizeofhead = sizeof(head) - AV_INPUT_BUFFER_PADDING_SIZE;
- int headsize = 0;
- int ctrl;
- AVRational tb;
- GetBitContext gbi, *gb = &gbi;
+ int headsize = 0, ret;
+ FFJXLMetadata meta = { 0 };
uint64_t sig16 = avio_rl16(pb);
if (sig16 == FF_JPEGXL_CODESTREAM_SIGNATURE_LE) {
@@ -167,7 +99,7 @@ static int jpegxl_anim_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA;
avio_skip(pb, 2); // first box always 12 bytes
while (1) {
- int copied;
+ int copied = 0;
uint8_t buf[4096];
int read = avio_read(pb, buf, sizeof(buf));
if (read < 0)
@@ -183,7 +115,7 @@ static int jpegxl_anim_read_header(AVFormatContext *s)
if (av_buffer_realloc(&ctx->initial, ctx->initial->size + read) < 0)
return AVERROR(ENOMEM);
}
- jpegxl_collect_codestream_header(buf, read, head + headsize, sizeofhead - headsize, &copied);
+ ff_jpegxl_collect_codestream_header(buf, read, head + headsize, sizeofhead - headsize, &copied);
memcpy(ctx->initial->data + (ctx->initial->size - read), buf, read);
headsize += copied;
if (headsize >= sizeofhead || read < sizeof(buf))
@@ -191,12 +123,9 @@ static int jpegxl_anim_read_header(AVFormatContext *s)
}
}
/* offset in bits of the animation header */
- offset = ff_jpegxl_verify_codestream_header(head, headsize, 0);
- if (offset <= 0)
- return AVERROR_INVALIDDATA;
- if (init_get_bits8(gb, head, headsize) < 0)
+ ret = ff_jpegxl_parse_codestream_header(head, headsize, 0, &meta);
+ if (ret < 0 || meta.animation_offset <= 0)
return AVERROR_INVALIDDATA;
- skip_bits_long(gb, offset);
st = avformat_new_stream(s, NULL);
if (!st)
@@ -204,11 +133,8 @@ static int jpegxl_anim_read_header(AVFormatContext *s)
st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
st->codecpar->codec_id = AV_CODEC_ID_JPEGXL;
- ctrl = get_bits(gb, 2);
- tb.den = (const uint32_t[]){100, 1000, 1, 1}[ctrl] + get_bits_long(gb, (const uint32_t[]){0, 0, 10, 30}[ctrl]);
- ctrl = get_bits(gb, 2);
- tb.num = (const uint32_t[]){1, 1001, 1, 1}[ctrl] + get_bits_long(gb, (const uint32_t[]){0, 0, 8, 10}[ctrl]);
- avpriv_set_pts_info(st, 1, tb.num, tb.den);
+ avpriv_set_pts_info(st, 1, meta.timebase.num, meta.timebase.den);
+ ffstream(st)->need_parsing = AVSTREAM_PARSE_HEADERS;
return 0;
}
@@ -265,7 +191,7 @@ const AVInputFormat ff_jpegxl_anim_demuxer = {
.read_packet = jpegxl_anim_read_packet,
.read_close = jpegxl_anim_close,
.flags_internal = FF_FMT_INIT_CLEANUP,
- .flags = AVFMT_GENERIC_INDEX,
+ .flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS,
.mime_type = "image/jxl",
.extensions = "jxl",
};
diff --git a/libavformat/jpegxl_probe.h b/libavformat/jpegxl_parse.c
similarity index 55%
rename from libavformat/jpegxl_probe.h
rename to libavformat/jpegxl_parse.c
index 496445fbce..1be5fd716f 100644
--- a/libavformat/jpegxl_probe.h
+++ b/libavformat/jpegxl_parse.c
@@ -1,6 +1,6 @@
/*
- * Jpeg XL header verification
- * Copyright (c) 2022 Leo Izen <leo.izen@gmail.com>
+ * JPEG XL Header Parser
+ * Copyright (c) 2023 Leo Izen <leo.izen@gmail.com>
*
* This file is part of FFmpeg.
*
@@ -19,19 +19,4 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVFORMAT_JPEGXL_PROBE_H
-#define AVFORMAT_JPEGXL_PROBE_H
-
-#include <stdint.h>
-
-#define FF_JPEGXL_CODESTREAM_SIGNATURE_LE 0x0aff
-#define FF_JPEGXL_CONTAINER_SIGNATURE_LE 0x204c584a0c000000
-
-/**
- * @brief verify that a codestream header is valid
- * @return Negative upon error, 0 upon verifying that the codestream is not animated,
- * and 1 upon verifying that it is animated
- */
-int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int validate_level);
-
-#endif /* AVFORMAT_JPEGXL_PROBE_H */
+ #include "libavcodec/jpegxl_parse.c"
diff --git a/libavformat/jpegxl_probe.c b/libavformat/jpegxl_probe.c
deleted file mode 100644
index 88492cb772..0000000000
--- a/libavformat/jpegxl_probe.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Jpeg XL header verification
- * Copyright (c) 2022 Leo Izen <leo.izen@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 "jpegxl_probe.h"
-
-#define UNCHECKED_BITSTREAM_READER 0
-#define BITSTREAM_READER_LE
-#include "libavcodec/get_bits.h"
-
-enum JpegXLExtraChannelType {
- FF_JPEGXL_CT_ALPHA = 0,
- FF_JPEGXL_CT_DEPTH,
- FF_JPEGXL_CT_SPOT_COLOR,
- FF_JPEGXL_CT_SELECTION_MASK,
- FF_JPEGXL_CT_BLACK,
- FF_JPEGXL_CT_CFA,
- FF_JPEGXL_CT_THERMAL,
- FF_JPEGXL_CT_NON_OPTIONAL = 15,
- FF_JPEGXL_CT_OPTIONAL
-};
-
-enum JpegXLColorSpace {
- FF_JPEGXL_CS_RGB = 0,
- FF_JPEGXL_CS_GRAY,
- FF_JPEGXL_CS_XYB,
- FF_JPEGXL_CS_UNKNOWN
-};
-
-enum JpegXLWhitePoint {
- FF_JPEGXL_WP_D65 = 1,
- FF_JPEGXL_WP_CUSTOM,
- FF_JPEGXL_WP_E = 10,
- FF_JPEGXL_WP_DCI = 11
-};
-
-enum JpegXLPrimaries {
- FF_JPEGXL_PR_SRGB = 1,
- FF_JPEGXL_PR_CUSTOM,
- FF_JPEGXL_PR_2100 = 9,
- FF_JPEGXL_PR_P3 = 11,
-};
-
-/* 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 0:
- ret = 0;
- break;
- 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;
- }
-
- 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)
-{
- 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;
-
- 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;
-}
-
-/**
- * skip a Jpeg XL BitDepth Header. These cannot be invalid.
- */
-static void jpegxl_skip_bit_depth(GetBitContext *gb)
-{
- if (get_bits1(gb)) {
- /* float samples */
- jxl_u32(gb, 32, 16, 24, 1, 0, 0, 0, 6); /* mantissa */
- skip_bits_long(gb, 4); /* exponent */
- } else {
- /* integer samples */
- jxl_u32(gb, 8, 10, 12, 1, 0, 0, 0, 6);
- }
-}
-
-/**
- * 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)
-{
- 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 == FF_JPEGXL_CT_BLACK && validate_level)
- return -1;
- jpegxl_skip_bit_depth(gb);
- 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 = FF_JPEGXL_CT_ALPHA;
- }
-
- /* skip over the name */
- skip_bits_long(gb, 8 * name_len);
-
- if (!all_default && type == FF_JPEGXL_CT_ALPHA)
- skip_bits1(gb);
-
- if (type == FF_JPEGXL_CT_SPOT_COLOR)
- skip_bits_long(gb, 16 * 4);
-
- if (type == FF_JPEGXL_CT_CFA)
- jxl_u32(gb, 1, 0, 3, 19, 0, 2, 4, 8);
-
- return 0;
-}
-
-int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int validate_level)
-{
- GetBitContext gbi, *gb = &gbi;
- int all_default, extra_fields = 0;
- int xyb_encoded = 1, have_icc_profile = 0;
- int animation_offset = 0;
- 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;
-
- if ((ret = jpegxl_read_size_header(gb)) < 0 && validate_level)
- return ret;
-
- all_default = get_bits1(gb);
- if (!all_default)
- extra_fields = get_bits1(gb);
-
- if (extra_fields) {
- skip_bits_long(gb, 3); /* orientation */
-
- /*
- * 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);
-
- /* 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);
- jxl_u32(gb, 100, 1000, 1, 1, 0, 0, 10, 30);
- 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 (get_bits_left(gb) < 1)
- return AVERROR_INVALIDDATA;
-
- if (!all_default) {
- jpegxl_skip_bit_depth(gb);
-
- /* 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);
- 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 (!have_icc_profile) {
- if (color_space != FF_JPEGXL_CS_XYB) {
- uint32_t white_point = jxl_enum(gb);
- if (white_point > 63)
- return -1;
- if (white_point == FF_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 != FF_JPEGXL_CS_GRAY) {
- /* primaries */
- uint32_t primaries = jxl_enum(gb);
- if (primaries > 63)
- return -1;
- if (primaries == FF_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 */
- skip_bits_long(gb, 24);
- } else {
- /* transfer function */
- if (jxl_enum(gb) > 63)
- return -1;
- }
-
- /* 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;
- }
- }
- }
-
- /* 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 animation_offset;
-}
--
2.41.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread* [FFmpeg-devel] [PATCH v4 4/4] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim
2023-06-26 15:49 [FFmpeg-devel] [PATCH v4 0/4] JPEG XL Parser Leo Izen
` (2 preceding siblings ...)
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 3/4] avformat/jpegxl: remove jpegxl_probe, instead call avcodec/jpegxl_parse Leo Izen
@ 2023-06-26 15:49 ` Leo Izen
2023-06-27 23:25 ` James Almer
3 siblings, 1 reply; 13+ messages in thread
From: Leo Izen @ 2023-06-26 15:49 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Leo Izen
Adds a fate test for the jpegxl_anim demuxer, that should allow testing
for true positives and false positives for animated jpegxl files. Note
that two of the test cases are not animated, in order to help sort out
false positives.
Signed-off-by: <leo.izen@gmail.com>
---
tests/Makefile | 1 +
tests/fate/jxl.mak | 16 ++++++++++++++++
tests/ref/fate/jxl-anim-demux-belgium | 6 ++++++
tests/ref/fate/jxl-anim-demux-icos4d | 6 ++++++
tests/ref/fate/jxl-anim-demux-lenna256 | 7 +++++++
tests/ref/fate/jxl-anim-demux-newton | 6 ++++++
6 files changed, 42 insertions(+)
create mode 100644 tests/fate/jxl.mak
create mode 100644 tests/ref/fate/jxl-anim-demux-belgium
create mode 100644 tests/ref/fate/jxl-anim-demux-icos4d
create mode 100644 tests/ref/fate/jxl-anim-demux-lenna256
create mode 100644 tests/ref/fate/jxl-anim-demux-newton
diff --git a/tests/Makefile b/tests/Makefile
index e09f30a0fc..7b80762e81 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -201,6 +201,7 @@ include $(SRC_PATH)/tests/fate/image.mak
include $(SRC_PATH)/tests/fate/imf.mak
include $(SRC_PATH)/tests/fate/indeo.mak
include $(SRC_PATH)/tests/fate/jpeg2000.mak
+include $(SRC_PATH)/tests/fate/jxl.mak
include $(SRC_PATH)/tests/fate/libavcodec.mak
include $(SRC_PATH)/tests/fate/libavdevice.mak
include $(SRC_PATH)/tests/fate/libavformat.mak
diff --git a/tests/fate/jxl.mak b/tests/fate/jxl.mak
new file mode 100644
index 0000000000..057d3be0e1
--- /dev/null
+++ b/tests/fate/jxl.mak
@@ -0,0 +1,16 @@
+# These two are animated JXL files
+FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-newton
+fate-jxl-anim-demux-newton: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/newton.jxl -c copy
+FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-icos4d
+fate-jxl-anim-demux-icos4d: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/icos4d.jxl -c copy
+
+# These two are not animated JXL. They are here to check false positives.
+FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-belgium
+fate-jxl-anim-demux-belgium: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/belgium.jxl -c copy
+FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-lenna256
+fate-jxl-anim-demux-lenna256: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/lenna-256.jxl -c copy
+
+FATE_JPEGXL_ANIM_DEMUX += $(FATE_JPEGXL_ANIM_DEMUX-yes)
+
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, JPEGXL_ANIM) += $(FATE_JPEGXL_ANIM_DEMUX)
+fate-jxl-anim-demux: $(FATE_JPEGXL_ANIM_DEMUX)
diff --git a/tests/ref/fate/jxl-anim-demux-belgium b/tests/ref/fate/jxl-anim-demux-belgium
new file mode 100644
index 0000000000..b2fe5035ac
--- /dev/null
+++ b/tests/ref/fate/jxl-anim-demux-belgium
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: jpegxl
+#dimensions 0: 768x512
+#sar 0: 0/1
+0, 0, 0, 1, 32, 0xa2930a20
diff --git a/tests/ref/fate/jxl-anim-demux-icos4d b/tests/ref/fate/jxl-anim-demux-icos4d
new file mode 100644
index 0000000000..eff6ff1f1b
--- /dev/null
+++ b/tests/ref/fate/jxl-anim-demux-icos4d
@@ -0,0 +1,6 @@
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: jpegxl
+#dimensions 0: 48x48
+#sar 0: 0/1
+0, 0, 0, 0, 67898, 0x53b6516b
diff --git a/tests/ref/fate/jxl-anim-demux-lenna256 b/tests/ref/fate/jxl-anim-demux-lenna256
new file mode 100644
index 0000000000..0bd286a451
--- /dev/null
+++ b/tests/ref/fate/jxl-anim-demux-lenna256
@@ -0,0 +1,7 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: jpegxl
+#dimensions 0: 256x256
+#sar 0: 0/1
+0, 0, 0, 1, 4096, 0x2409e9e3
+0, 1, 1, 1, 3992, 0x966dbfcb
diff --git a/tests/ref/fate/jxl-anim-demux-newton b/tests/ref/fate/jxl-anim-demux-newton
new file mode 100644
index 0000000000..6fcb85c41e
--- /dev/null
+++ b/tests/ref/fate/jxl-anim-demux-newton
@@ -0,0 +1,6 @@
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: jpegxl
+#dimensions 0: 128x96
+#sar 0: 0/1
+0, 0, 0, 0, 43376, 0xb2296182
--
2.41.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [FFmpeg-devel] [PATCH v4 4/4] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim
2023-06-26 15:49 ` [FFmpeg-devel] [PATCH v4 4/4] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim Leo Izen
@ 2023-06-27 23:25 ` James Almer
2023-06-27 23:32 ` Leo Izen
0 siblings, 1 reply; 13+ messages in thread
From: James Almer @ 2023-06-27 23:25 UTC (permalink / raw)
To: ffmpeg-devel
On 6/26/2023 12:49 PM, Leo Izen wrote:
> Adds a fate test for the jpegxl_anim demuxer, that should allow testing
> for true positives and false positives for animated jpegxl files. Note
> that two of the test cases are not animated, in order to help sort out
> false positives.
>
> Signed-off-by: <leo.izen@gmail.com>
> ---
> tests/Makefile | 1 +
> tests/fate/jxl.mak | 16 ++++++++++++++++
> tests/ref/fate/jxl-anim-demux-belgium | 6 ++++++
> tests/ref/fate/jxl-anim-demux-icos4d | 6 ++++++
> tests/ref/fate/jxl-anim-demux-lenna256 | 7 +++++++
> tests/ref/fate/jxl-anim-demux-newton | 6 ++++++
> 6 files changed, 42 insertions(+)
> create mode 100644 tests/fate/jxl.mak
> create mode 100644 tests/ref/fate/jxl-anim-demux-belgium
> create mode 100644 tests/ref/fate/jxl-anim-demux-icos4d
> create mode 100644 tests/ref/fate/jxl-anim-demux-lenna256
> create mode 100644 tests/ref/fate/jxl-anim-demux-newton
>
> diff --git a/tests/Makefile b/tests/Makefile
> index e09f30a0fc..7b80762e81 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -201,6 +201,7 @@ include $(SRC_PATH)/tests/fate/image.mak
> include $(SRC_PATH)/tests/fate/imf.mak
> include $(SRC_PATH)/tests/fate/indeo.mak
> include $(SRC_PATH)/tests/fate/jpeg2000.mak
> +include $(SRC_PATH)/tests/fate/jxl.mak
> include $(SRC_PATH)/tests/fate/libavcodec.mak
> include $(SRC_PATH)/tests/fate/libavdevice.mak
> include $(SRC_PATH)/tests/fate/libavformat.mak
> diff --git a/tests/fate/jxl.mak b/tests/fate/jxl.mak
> new file mode 100644
> index 0000000000..057d3be0e1
> --- /dev/null
> +++ b/tests/fate/jxl.mak
> @@ -0,0 +1,16 @@
> +# These two are animated JXL files
> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-newton
> +fate-jxl-anim-demux-newton: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/newton.jxl -c copy
> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-icos4d
> +fate-jxl-anim-demux-icos4d: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/icos4d.jxl -c copy
> +
> +# These two are not animated JXL. They are here to check false positives.
> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-belgium
> +fate-jxl-anim-demux-belgium: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/belgium.jxl -c copy
> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-lenna256
> +fate-jxl-anim-demux-lenna256: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/lenna-256.jxl -c copy
> +
> +FATE_JPEGXL_ANIM_DEMUX += $(FATE_JPEGXL_ANIM_DEMUX-yes)
> +
> +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, JPEGXL_ANIM) += $(FATE_JPEGXL_ANIM_DEMUX)
> +fate-jxl-anim-demux: $(FATE_JPEGXL_ANIM_DEMUX)
> diff --git a/tests/ref/fate/jxl-anim-demux-belgium b/tests/ref/fate/jxl-anim-demux-belgium
> new file mode 100644
> index 0000000000..b2fe5035ac
> --- /dev/null
> +++ b/tests/ref/fate/jxl-anim-demux-belgium
> @@ -0,0 +1,6 @@
> +#tb 0: 1/25
> +#media_type 0: video
> +#codec_id 0: jpegxl
> +#dimensions 0: 768x512
> +#sar 0: 0/1
> +0, 0, 0, 1, 32, 0xa2930a20
> diff --git a/tests/ref/fate/jxl-anim-demux-icos4d b/tests/ref/fate/jxl-anim-demux-icos4d
> new file mode 100644
> index 0000000000..eff6ff1f1b
> --- /dev/null
> +++ b/tests/ref/fate/jxl-anim-demux-icos4d
> @@ -0,0 +1,6 @@
> +#tb 0: 1/1000
> +#media_type 0: video
> +#codec_id 0: jpegxl
> +#dimensions 0: 48x48
> +#sar 0: 0/1
> +0, 0, 0, 0, 67898, 0x53b6516b
> diff --git a/tests/ref/fate/jxl-anim-demux-lenna256 b/tests/ref/fate/jxl-anim-demux-lenna256
> new file mode 100644
> index 0000000000..0bd286a451
> --- /dev/null
> +++ b/tests/ref/fate/jxl-anim-demux-lenna256
> @@ -0,0 +1,7 @@
> +#tb 0: 1/25
> +#media_type 0: video
> +#codec_id 0: jpegxl
> +#dimensions 0: 256x256
> +#sar 0: 0/1
> +0, 0, 0, 1, 4096, 0x2409e9e3
> +0, 1, 1, 1, 3992, 0x966dbfcb
What this tells me is that the parser needs to do bitstream assembly
after all. Image2 should not propagate a single image split in two
packets like this, at the arbitrary limit of 4kb.
Since this format seems to have actual delimiters
(FF_JPEGXL_CODESTREAM_SIGNATURE_LE and FF_JPEGXL_CONTAINER_SIGNATURE_LE)
and even buffer bytes with ff_jpegxl_collect_codestream_header(), you
should then do the assembly in the parser, much like it's done for bmp,
jpg and many other image formats.
The anim demuxer can remain as PARSE_HEADERS so it doesn't run the frame
assembly code.
> diff --git a/tests/ref/fate/jxl-anim-demux-newton b/tests/ref/fate/jxl-anim-demux-newton
> new file mode 100644
> index 0000000000..6fcb85c41e
> --- /dev/null
> +++ b/tests/ref/fate/jxl-anim-demux-newton
> @@ -0,0 +1,6 @@
> +#tb 0: 1/1000
> +#media_type 0: video
> +#codec_id 0: jpegxl
> +#dimensions 0: 128x96
> +#sar 0: 0/1
> +0, 0, 0, 0, 43376, 0xb2296182
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4 4/4] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim
2023-06-27 23:25 ` James Almer
@ 2023-06-27 23:32 ` Leo Izen
2023-06-27 23:46 ` James Almer
0 siblings, 1 reply; 13+ messages in thread
From: Leo Izen @ 2023-06-27 23:32 UTC (permalink / raw)
To: ffmpeg-devel
On 6/27/23 19:25, James Almer wrote:
> On 6/26/2023 12:49 PM, Leo Izen wrote:
>> Adds a fate test for the jpegxl_anim demuxer, that should allow testing
>> for true positives and false positives for animated jpegxl files. Note
>> that two of the test cases are not animated, in order to help sort out
>> false positives.
>>
>> Signed-off-by: <leo.izen@gmail.com>
>> ---
>> tests/Makefile | 1 +
>> tests/fate/jxl.mak | 16 ++++++++++++++++
>> tests/ref/fate/jxl-anim-demux-belgium | 6 ++++++
>> tests/ref/fate/jxl-anim-demux-icos4d | 6 ++++++
>> tests/ref/fate/jxl-anim-demux-lenna256 | 7 +++++++
>> tests/ref/fate/jxl-anim-demux-newton | 6 ++++++
>> 6 files changed, 42 insertions(+)
>> create mode 100644 tests/fate/jxl.mak
>> create mode 100644 tests/ref/fate/jxl-anim-demux-belgium
>> create mode 100644 tests/ref/fate/jxl-anim-demux-icos4d
>> create mode 100644 tests/ref/fate/jxl-anim-demux-lenna256
>> create mode 100644 tests/ref/fate/jxl-anim-demux-newton
>>
>> diff --git a/tests/Makefile b/tests/Makefile
>> index e09f30a0fc..7b80762e81 100644
>> --- a/tests/Makefile
>> +++ b/tests/Makefile
>> @@ -201,6 +201,7 @@ include $(SRC_PATH)/tests/fate/image.mak
>> include $(SRC_PATH)/tests/fate/imf.mak
>> include $(SRC_PATH)/tests/fate/indeo.mak
>> include $(SRC_PATH)/tests/fate/jpeg2000.mak
>> +include $(SRC_PATH)/tests/fate/jxl.mak
>> include $(SRC_PATH)/tests/fate/libavcodec.mak
>> include $(SRC_PATH)/tests/fate/libavdevice.mak
>> include $(SRC_PATH)/tests/fate/libavformat.mak
>> diff --git a/tests/fate/jxl.mak b/tests/fate/jxl.mak
>> new file mode 100644
>> index 0000000000..057d3be0e1
>> --- /dev/null
>> +++ b/tests/fate/jxl.mak
>> @@ -0,0 +1,16 @@
>> +# These two are animated JXL files
>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-newton
>> +fate-jxl-anim-demux-newton: CMD = framecrc -i
>> $(TARGET_SAMPLES)/jxl/newton.jxl -c copy
>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-icos4d
>> +fate-jxl-anim-demux-icos4d: CMD = framecrc -i
>> $(TARGET_SAMPLES)/jxl/icos4d.jxl -c copy
>> +
>> +# These two are not animated JXL. They are here to check false
>> positives.
>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-belgium
>> +fate-jxl-anim-demux-belgium: CMD = framecrc -i
>> $(TARGET_SAMPLES)/jxl/belgium.jxl -c copy
>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-lenna256
>> +fate-jxl-anim-demux-lenna256: CMD = framecrc -i
>> $(TARGET_SAMPLES)/jxl/lenna-256.jxl -c copy
>> +
>> +FATE_JPEGXL_ANIM_DEMUX += $(FATE_JPEGXL_ANIM_DEMUX-yes)
>> +
>> +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, JPEGXL_ANIM) +=
>> $(FATE_JPEGXL_ANIM_DEMUX)
>> +fate-jxl-anim-demux: $(FATE_JPEGXL_ANIM_DEMUX)
>> diff --git a/tests/ref/fate/jxl-anim-demux-belgium
>> b/tests/ref/fate/jxl-anim-demux-belgium
>> new file mode 100644
>> index 0000000000..b2fe5035ac
>> --- /dev/null
>> +++ b/tests/ref/fate/jxl-anim-demux-belgium
>> @@ -0,0 +1,6 @@
>> +#tb 0: 1/25
>> +#media_type 0: video
>> +#codec_id 0: jpegxl
>> +#dimensions 0: 768x512
>> +#sar 0: 0/1
>> +0, 0, 0, 1, 32, 0xa2930a20
>> diff --git a/tests/ref/fate/jxl-anim-demux-icos4d
>> b/tests/ref/fate/jxl-anim-demux-icos4d
>> new file mode 100644
>> index 0000000000..eff6ff1f1b
>> --- /dev/null
>> +++ b/tests/ref/fate/jxl-anim-demux-icos4d
>> @@ -0,0 +1,6 @@
>> +#tb 0: 1/1000
>> +#media_type 0: video
>> +#codec_id 0: jpegxl
>> +#dimensions 0: 48x48
>> +#sar 0: 0/1
>> +0, 0, 0, 0, 67898, 0x53b6516b
>> diff --git a/tests/ref/fate/jxl-anim-demux-lenna256
>> b/tests/ref/fate/jxl-anim-demux-lenna256
>> new file mode 100644
>> index 0000000000..0bd286a451
>> --- /dev/null
>> +++ b/tests/ref/fate/jxl-anim-demux-lenna256
>> @@ -0,0 +1,7 @@
>> +#tb 0: 1/25
>> +#media_type 0: video
>> +#codec_id 0: jpegxl
>> +#dimensions 0: 256x256
>> +#sar 0: 0/1
>> +0, 0, 0, 1, 4096, 0x2409e9e3
>> +0, 1, 1, 1, 3992, 0x966dbfcb
>
> What this tells me is that the parser needs to do bitstream assembly
> after all. Image2 should not propagate a single image split in two
> packets like this, at the arbitrary limit of 4kb.
>
> Since this format seems to have actual delimiters
> (FF_JPEGXL_CODESTREAM_SIGNATURE_LE and FF_JPEGXL_CONTAINER_SIGNATURE_LE)
> and even buffer bytes with ff_jpegxl_collect_codestream_header(), you
> should then do the assembly in the parser, much like it's done for bmp,
> jpg and many other image formats.
> The anim demuxer can remain as PARSE_HEADERS so it doesn't run the frame
> assembly code.
>
The codestream signature is 0xFF 0x0A, which can and frequently will
occur unescaped in the middle of a valid file. Detecting the end of the
file is also a Hard Problem as it requires an entropy decoder, which I
believe you NAK'd for being overly complex for a parser in the first
iteration of this a few months ago.
If I choose to assemble a bitstream here with the parser, what will end
up happening is that the entire sequence of all input frames will be one
large AVPacket, as detecting the end of the image is nontrivial. Is this
behavior desirable, compared to what image2dec does, which is emit
arbitrary 4k-sized packets?
If so, I can change it to assemble a packet, but I just want to make
sure that behavior is desirable over what I have here.
- Leo Izen
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4 4/4] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim
2023-06-27 23:32 ` Leo Izen
@ 2023-06-27 23:46 ` James Almer
2023-06-28 0:33 ` Leo Izen
0 siblings, 1 reply; 13+ messages in thread
From: James Almer @ 2023-06-27 23:46 UTC (permalink / raw)
To: ffmpeg-devel
On 6/27/2023 8:32 PM, Leo Izen wrote:
> On 6/27/23 19:25, James Almer wrote:
>> On 6/26/2023 12:49 PM, Leo Izen wrote:
>>> Adds a fate test for the jpegxl_anim demuxer, that should allow testing
>>> for true positives and false positives for animated jpegxl files. Note
>>> that two of the test cases are not animated, in order to help sort out
>>> false positives.
>>>
>>> Signed-off-by: <leo.izen@gmail.com>
>>> ---
>>> tests/Makefile | 1 +
>>> tests/fate/jxl.mak | 16 ++++++++++++++++
>>> tests/ref/fate/jxl-anim-demux-belgium | 6 ++++++
>>> tests/ref/fate/jxl-anim-demux-icos4d | 6 ++++++
>>> tests/ref/fate/jxl-anim-demux-lenna256 | 7 +++++++
>>> tests/ref/fate/jxl-anim-demux-newton | 6 ++++++
>>> 6 files changed, 42 insertions(+)
>>> create mode 100644 tests/fate/jxl.mak
>>> create mode 100644 tests/ref/fate/jxl-anim-demux-belgium
>>> create mode 100644 tests/ref/fate/jxl-anim-demux-icos4d
>>> create mode 100644 tests/ref/fate/jxl-anim-demux-lenna256
>>> create mode 100644 tests/ref/fate/jxl-anim-demux-newton
>>>
>>> diff --git a/tests/Makefile b/tests/Makefile
>>> index e09f30a0fc..7b80762e81 100644
>>> --- a/tests/Makefile
>>> +++ b/tests/Makefile
>>> @@ -201,6 +201,7 @@ include $(SRC_PATH)/tests/fate/image.mak
>>> include $(SRC_PATH)/tests/fate/imf.mak
>>> include $(SRC_PATH)/tests/fate/indeo.mak
>>> include $(SRC_PATH)/tests/fate/jpeg2000.mak
>>> +include $(SRC_PATH)/tests/fate/jxl.mak
>>> include $(SRC_PATH)/tests/fate/libavcodec.mak
>>> include $(SRC_PATH)/tests/fate/libavdevice.mak
>>> include $(SRC_PATH)/tests/fate/libavformat.mak
>>> diff --git a/tests/fate/jxl.mak b/tests/fate/jxl.mak
>>> new file mode 100644
>>> index 0000000000..057d3be0e1
>>> --- /dev/null
>>> +++ b/tests/fate/jxl.mak
>>> @@ -0,0 +1,16 @@
>>> +# These two are animated JXL files
>>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-newton
>>> +fate-jxl-anim-demux-newton: CMD = framecrc -i
>>> $(TARGET_SAMPLES)/jxl/newton.jxl -c copy
>>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-icos4d
>>> +fate-jxl-anim-demux-icos4d: CMD = framecrc -i
>>> $(TARGET_SAMPLES)/jxl/icos4d.jxl -c copy
>>> +
>>> +# These two are not animated JXL. They are here to check false
>>> positives.
>>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-belgium
>>> +fate-jxl-anim-demux-belgium: CMD = framecrc -i
>>> $(TARGET_SAMPLES)/jxl/belgium.jxl -c copy
>>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-lenna256
>>> +fate-jxl-anim-demux-lenna256: CMD = framecrc -i
>>> $(TARGET_SAMPLES)/jxl/lenna-256.jxl -c copy
>>> +
>>> +FATE_JPEGXL_ANIM_DEMUX += $(FATE_JPEGXL_ANIM_DEMUX-yes)
>>> +
>>> +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, JPEGXL_ANIM) +=
>>> $(FATE_JPEGXL_ANIM_DEMUX)
>>> +fate-jxl-anim-demux: $(FATE_JPEGXL_ANIM_DEMUX)
>>> diff --git a/tests/ref/fate/jxl-anim-demux-belgium
>>> b/tests/ref/fate/jxl-anim-demux-belgium
>>> new file mode 100644
>>> index 0000000000..b2fe5035ac
>>> --- /dev/null
>>> +++ b/tests/ref/fate/jxl-anim-demux-belgium
>>> @@ -0,0 +1,6 @@
>>> +#tb 0: 1/25
>>> +#media_type 0: video
>>> +#codec_id 0: jpegxl
>>> +#dimensions 0: 768x512
>>> +#sar 0: 0/1
>>> +0, 0, 0, 1, 32, 0xa2930a20
>>> diff --git a/tests/ref/fate/jxl-anim-demux-icos4d
>>> b/tests/ref/fate/jxl-anim-demux-icos4d
>>> new file mode 100644
>>> index 0000000000..eff6ff1f1b
>>> --- /dev/null
>>> +++ b/tests/ref/fate/jxl-anim-demux-icos4d
>>> @@ -0,0 +1,6 @@
>>> +#tb 0: 1/1000
>>> +#media_type 0: video
>>> +#codec_id 0: jpegxl
>>> +#dimensions 0: 48x48
>>> +#sar 0: 0/1
>>> +0, 0, 0, 0, 67898, 0x53b6516b
>>> diff --git a/tests/ref/fate/jxl-anim-demux-lenna256
>>> b/tests/ref/fate/jxl-anim-demux-lenna256
>>> new file mode 100644
>>> index 0000000000..0bd286a451
>>> --- /dev/null
>>> +++ b/tests/ref/fate/jxl-anim-demux-lenna256
>>> @@ -0,0 +1,7 @@
>>> +#tb 0: 1/25
>>> +#media_type 0: video
>>> +#codec_id 0: jpegxl
>>> +#dimensions 0: 256x256
>>> +#sar 0: 0/1
>>> +0, 0, 0, 1, 4096, 0x2409e9e3
>>> +0, 1, 1, 1, 3992, 0x966dbfcb
>>
>> What this tells me is that the parser needs to do bitstream assembly
>> after all. Image2 should not propagate a single image split in two
>> packets like this, at the arbitrary limit of 4kb.
>>
>> Since this format seems to have actual delimiters
>> (FF_JPEGXL_CODESTREAM_SIGNATURE_LE and
>> FF_JPEGXL_CONTAINER_SIGNATURE_LE) and even buffer bytes with
>> ff_jpegxl_collect_codestream_header(), you should then do the assembly
>> in the parser, much like it's done for bmp, jpg and many other image
>> formats.
>> The anim demuxer can remain as PARSE_HEADERS so it doesn't run the
>> frame assembly code.
>>
>
> The codestream signature is 0xFF 0x0A, which can and frequently will
> occur unescaped in the middle of a valid file. Detecting the end of the
> file is also a Hard Problem as it requires an entropy decoder, which I
> believe you NAK'd for being overly complex for a parser in the first
> iteration of this a few months ago.
Can you link that first iteration?
>
> If I choose to assemble a bitstream here with the parser, what will end
> up happening is that the entire sequence of all input frames will be one
> large AVPacket, as detecting the end of the image is nontrivial. Is this
> behavior desirable, compared to what image2dec does, which is emit
> arbitrary 4k-sized packets?
What do you mean by all input frames? In the case of animated jpegxl,
the anim demuxer would handle it, not image2. image2 should be used to
read and output single frame images.
In any case, what would happen is that image2 will propagate packets of
up to 4kb size, which the parser invoked in demux.c will then consume
and not return anything until it has decided it has a complete coded
image a decoder can then use to fully decode and output a frame, or a
muxer encapsulate. Said complete coded image is output as a single
buffer which is propagated to the caller as a single AVPacket.
>
> If so, I can change it to assemble a packet, but I just want to make
> sure that behavior is desirable over what I have here.
>
> - Leo Izen
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4 4/4] fate/jpegxl_anim: add demuxer fate test for jpegxl_anim
2023-06-27 23:46 ` James Almer
@ 2023-06-28 0:33 ` Leo Izen
0 siblings, 0 replies; 13+ messages in thread
From: Leo Izen @ 2023-06-28 0:33 UTC (permalink / raw)
To: ffmpeg-devel
On 6/27/23 19:46, James Almer wrote:
> On 6/27/2023 8:32 PM, Leo Izen wrote:
>> On 6/27/23 19:25, James Almer wrote:
>>> On 6/26/2023 12:49 PM, Leo Izen wrote:
>>>> Adds a fate test for the jpegxl_anim demuxer, that should allow testing
>>>> for true positives and false positives for animated jpegxl files. Note
>>>> that two of the test cases are not animated, in order to help sort out
>>>> false positives.
>>>>
>>>> Signed-off-by: <leo.izen@gmail.com>
>>>> ---
>>>> tests/Makefile | 1 +
>>>> tests/fate/jxl.mak | 16 ++++++++++++++++
>>>> tests/ref/fate/jxl-anim-demux-belgium | 6 ++++++
>>>> tests/ref/fate/jxl-anim-demux-icos4d | 6 ++++++
>>>> tests/ref/fate/jxl-anim-demux-lenna256 | 7 +++++++
>>>> tests/ref/fate/jxl-anim-demux-newton | 6 ++++++
>>>> 6 files changed, 42 insertions(+)
>>>> create mode 100644 tests/fate/jxl.mak
>>>> create mode 100644 tests/ref/fate/jxl-anim-demux-belgium
>>>> create mode 100644 tests/ref/fate/jxl-anim-demux-icos4d
>>>> create mode 100644 tests/ref/fate/jxl-anim-demux-lenna256
>>>> create mode 100644 tests/ref/fate/jxl-anim-demux-newton
>>>>
>>>> diff --git a/tests/Makefile b/tests/Makefile
>>>> index e09f30a0fc..7b80762e81 100644
>>>> --- a/tests/Makefile
>>>> +++ b/tests/Makefile
>>>> @@ -201,6 +201,7 @@ include $(SRC_PATH)/tests/fate/image.mak
>>>> include $(SRC_PATH)/tests/fate/imf.mak
>>>> include $(SRC_PATH)/tests/fate/indeo.mak
>>>> include $(SRC_PATH)/tests/fate/jpeg2000.mak
>>>> +include $(SRC_PATH)/tests/fate/jxl.mak
>>>> include $(SRC_PATH)/tests/fate/libavcodec.mak
>>>> include $(SRC_PATH)/tests/fate/libavdevice.mak
>>>> include $(SRC_PATH)/tests/fate/libavformat.mak
>>>> diff --git a/tests/fate/jxl.mak b/tests/fate/jxl.mak
>>>> new file mode 100644
>>>> index 0000000000..057d3be0e1
>>>> --- /dev/null
>>>> +++ b/tests/fate/jxl.mak
>>>> @@ -0,0 +1,16 @@
>>>> +# These two are animated JXL files
>>>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-newton
>>>> +fate-jxl-anim-demux-newton: CMD = framecrc -i
>>>> $(TARGET_SAMPLES)/jxl/newton.jxl -c copy
>>>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-icos4d
>>>> +fate-jxl-anim-demux-icos4d: CMD = framecrc -i
>>>> $(TARGET_SAMPLES)/jxl/icos4d.jxl -c copy
>>>> +
>>>> +# These two are not animated JXL. They are here to check false
>>>> positives.
>>>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-belgium
>>>> +fate-jxl-anim-demux-belgium: CMD = framecrc -i
>>>> $(TARGET_SAMPLES)/jxl/belgium.jxl -c copy
>>>> +FATE_JPEGXL_ANIM_DEMUX += fate-jxl-anim-demux-lenna256
>>>> +fate-jxl-anim-demux-lenna256: CMD = framecrc -i
>>>> $(TARGET_SAMPLES)/jxl/lenna-256.jxl -c copy
>>>> +
>>>> +FATE_JPEGXL_ANIM_DEMUX += $(FATE_JPEGXL_ANIM_DEMUX-yes)
>>>> +
>>>> +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, JPEGXL_ANIM) +=
>>>> $(FATE_JPEGXL_ANIM_DEMUX)
>>>> +fate-jxl-anim-demux: $(FATE_JPEGXL_ANIM_DEMUX)
>>>> diff --git a/tests/ref/fate/jxl-anim-demux-belgium
>>>> b/tests/ref/fate/jxl-anim-demux-belgium
>>>> new file mode 100644
>>>> index 0000000000..b2fe5035ac
>>>> --- /dev/null
>>>> +++ b/tests/ref/fate/jxl-anim-demux-belgium
>>>> @@ -0,0 +1,6 @@
>>>> +#tb 0: 1/25
>>>> +#media_type 0: video
>>>> +#codec_id 0: jpegxl
>>>> +#dimensions 0: 768x512
>>>> +#sar 0: 0/1
>>>> +0, 0, 0, 1, 32, 0xa2930a20
>>>> diff --git a/tests/ref/fate/jxl-anim-demux-icos4d
>>>> b/tests/ref/fate/jxl-anim-demux-icos4d
>>>> new file mode 100644
>>>> index 0000000000..eff6ff1f1b
>>>> --- /dev/null
>>>> +++ b/tests/ref/fate/jxl-anim-demux-icos4d
>>>> @@ -0,0 +1,6 @@
>>>> +#tb 0: 1/1000
>>>> +#media_type 0: video
>>>> +#codec_id 0: jpegxl
>>>> +#dimensions 0: 48x48
>>>> +#sar 0: 0/1
>>>> +0, 0, 0, 0, 67898, 0x53b6516b
>>>> diff --git a/tests/ref/fate/jxl-anim-demux-lenna256
>>>> b/tests/ref/fate/jxl-anim-demux-lenna256
>>>> new file mode 100644
>>>> index 0000000000..0bd286a451
>>>> --- /dev/null
>>>> +++ b/tests/ref/fate/jxl-anim-demux-lenna256
>>>> @@ -0,0 +1,7 @@
>>>> +#tb 0: 1/25
>>>> +#media_type 0: video
>>>> +#codec_id 0: jpegxl
>>>> +#dimensions 0: 256x256
>>>> +#sar 0: 0/1
>>>> +0, 0, 0, 1, 4096, 0x2409e9e3
>>>> +0, 1, 1, 1, 3992, 0x966dbfcb
>>>
>>> What this tells me is that the parser needs to do bitstream assembly
>>> after all. Image2 should not propagate a single image split in two
>>> packets like this, at the arbitrary limit of 4kb.
>>>
>>> Since this format seems to have actual delimiters
>>> (FF_JPEGXL_CODESTREAM_SIGNATURE_LE and
>>> FF_JPEGXL_CONTAINER_SIGNATURE_LE) and even buffer bytes with
>>> ff_jpegxl_collect_codestream_header(), you should then do the
>>> assembly in the parser, much like it's done for bmp, jpg and many
>>> other image formats.
>>> The anim demuxer can remain as PARSE_HEADERS so it doesn't run the
>>> frame assembly code.
>>>
>>
>> The codestream signature is 0xFF 0x0A, which can and frequently will
>> occur unescaped in the middle of a valid file. Detecting the end of
>> the file is also a Hard Problem as it requires an entropy decoder,
>> which I believe you NAK'd for being overly complex for a parser in the
>> first iteration of this a few months ago.
>
> Can you link that first iteration?
https://patchwork.ffmpeg.org/project/ffmpeg/cover/20220401002006.44582-1-leo.izen@gmail.com/
>
>>
>> If I choose to assemble a bitstream here with the parser, what will
>> end up happening is that the entire sequence of all input frames will
>> be one large AVPacket, as detecting the end of the image is
>> nontrivial. Is this behavior desirable, compared to what image2dec
>> does, which is emit arbitrary 4k-sized packets?
>
> What do you mean by all input frames? In the case of animated jpegxl,
> the anim demuxer would handle it, not image2. image2 should be used to
> read and output single frame images.
>
> In any case, what would happen is that image2 will propagate packets of
> up to 4kb size, which the parser invoked in demux.c will then consume
> and not return anything until it has decided it has a complete coded
> image a decoder can then use to fully decode and output a frame, or a
> muxer encapsulate. Said complete coded image is output as a single
> buffer which is propagated to the caller as a single AVPacket.
>
>>
>> If so, I can change it to assemble a packet, but I just want to make
>> sure that behavior is desirable over what I have here.
>>
>> - Leo Izen
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 13+ messages in thread