* [FFmpeg-devel] [PATCH v2 1/3] avcodec/jpegxl_parse{, r}: use correct ISOBMFF extended size location
2023-11-27 14:10 [FFmpeg-devel] [PATCH v2 0/3] JPEG XL parser bug fixes Leo Izen
@ 2023-11-27 14:10 ` Leo Izen
2023-11-27 14:10 ` [FFmpeg-devel] [PATCH v2 2/3] avcodec/jpegxl_parser: fix parsing sequences of extremely small files Leo Izen
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Leo Izen @ 2023-11-27 14:10 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Leo Izen
According to ISO/IEC 14996-12, size == 1 means a 64-bit extended-size
field occurs *after* the 32-bit box type, not before. This fix should
allow correct parsing of JXL files with extended-size boxes.
Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
libavcodec/jpegxl_parse.c | 6 +++---
libavcodec/jpegxl_parser.c | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/libavcodec/jpegxl_parse.c b/libavcodec/jpegxl_parse.c
index eb28e80867..7cfdd3e7d5 100644
--- a/libavcodec/jpegxl_parse.c
+++ b/libavcodec/jpegxl_parse.c
@@ -462,8 +462,10 @@ int ff_jpegxl_collect_codestream_header(const uint8_t *input_buffer, int input_l
return AVERROR_BUFFER_TOO_SMALL;
size = bytestream2_get_be32(&gb);
+ tag = bytestream2_get_le32(&gb);
+
if (size == 1) {
- if (bytestream2_get_bytes_left(&gb) < 12)
+ if (bytestream2_get_bytes_left(&gb) < 8)
return AVERROR_BUFFER_TOO_SMALL;
size = bytestream2_get_be64(&gb);
head_size = 16;
@@ -474,8 +476,6 @@ int ff_jpegxl_collect_codestream_header(const uint8_t *input_buffer, int input_l
if (size)
size -= head_size;
- tag = bytestream2_get_le32(&gb);
-
if (tag == MKTAG('j','x','l','p')) {
uint32_t idx;
if (bytestream2_get_bytes_left(&gb) < 4)
diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c
index 630fc8a60b..750872f17f 100644
--- a/libavcodec/jpegxl_parser.c
+++ b/libavcodec/jpegxl_parser.c
@@ -1342,7 +1342,7 @@ static int skip_boxes(JXLParseContext *ctx, const uint8_t *buf, int buf_size)
while (1) {
uint64_t size;
- int head_size = 4;
+ int head_size = 8;
if (bytestream2_peek_le16(&gb) == FF_JPEGXL_CODESTREAM_SIGNATURE_LE)
break;
@@ -1353,16 +1353,17 @@ static int skip_boxes(JXLParseContext *ctx, const uint8_t *buf, int buf_size)
return AVERROR_BUFFER_TOO_SMALL;
size = bytestream2_get_be32(&gb);
+ bytestream2_skip(&gb, 4); // tag
if (size == 1) {
- if (bytestream2_get_bytes_left(&gb) < 12)
+ if (bytestream2_get_bytes_left(&gb) < 8)
return AVERROR_BUFFER_TOO_SMALL;
size = bytestream2_get_be64(&gb);
- head_size = 12;
+ head_size = 16;
}
if (!size)
return AVERROR_INVALIDDATA;
/* invalid ISOBMFF size */
- if (size <= head_size + 4 || size > INT_MAX - ctx->skip)
+ if (size <= head_size || size > INT_MAX - ctx->skip)
return AVERROR_INVALIDDATA;
ctx->skip += size;
--
2.43.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] 5+ messages in thread
* [FFmpeg-devel] [PATCH v2 2/3] avcodec/jpegxl_parser: fix parsing sequences of extremely small files
2023-11-27 14:10 [FFmpeg-devel] [PATCH v2 0/3] JPEG XL parser bug fixes Leo Izen
2023-11-27 14:10 ` [FFmpeg-devel] [PATCH v2 1/3] avcodec/jpegxl_parse{, r}: use correct ISOBMFF extended size location Leo Izen
@ 2023-11-27 14:10 ` Leo Izen
2023-11-27 14:10 ` [FFmpeg-devel] [PATCH v2 3/3] fate/jpegxl: add parser test for extboxes and " Leo Izen
2023-12-03 14:45 ` [FFmpeg-devel] [PATCH v2 0/3] JPEG XL parser bug fixes Leo Izen
3 siblings, 0 replies; 5+ messages in thread
From: Leo Izen @ 2023-11-27 14:10 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Leo Izen
This patch allows the JXL parser to parse sequences of extremely small
files concatenated together. (e.g. smaller than the parser buffer)
Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
libavcodec/jpegxl_parser.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c
index 750872f17f..006eb6b295 100644
--- a/libavcodec/jpegxl_parser.c
+++ b/libavcodec/jpegxl_parser.c
@@ -1454,15 +1454,21 @@ static int jpegxl_parse(AVCodecParserContext *s, AVCodecContext *avctx,
{
JXLParseContext *ctx = s->priv_data;
int next = END_NOT_FOUND, ret;
+ const uint8_t *pbuf = ctx->pc.buffer;
+ int pindex = ctx->pc.index;
*poutbuf_size = 0;
*poutbuf = NULL;
- if (!ctx->pc.index)
- goto flush;
+ if (!ctx->pc.index) {
+ if (ctx->pc.overread)
+ goto flush;
+ pbuf = buf;
+ pindex = buf_size;
+ }
if ((!ctx->container || !ctx->codestream_length) && !ctx->next) {
- ret = try_parse(s, avctx, ctx, ctx->pc.buffer, ctx->pc.index);
+ ret = try_parse(s, avctx, ctx, pbuf, pindex);
if (ret < 0)
goto flush;
ctx->next = ret;
@@ -1471,7 +1477,7 @@ static int jpegxl_parse(AVCodecParserContext *s, AVCodecContext *avctx,
}
if (ctx->container && ctx->next >= 0) {
- ret = skip_boxes(ctx, ctx->pc.buffer, ctx->pc.index);
+ ret = skip_boxes(ctx, pbuf, pindex);
if (ret < 0) {
if (ret == AVERROR_INVALIDDATA)
ctx->next = -1;
--
2.43.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] 5+ messages in thread
* [FFmpeg-devel] [PATCH v2 3/3] fate/jpegxl: add parser test for extboxes and small files
2023-11-27 14:10 [FFmpeg-devel] [PATCH v2 0/3] JPEG XL parser bug fixes Leo Izen
2023-11-27 14:10 ` [FFmpeg-devel] [PATCH v2 1/3] avcodec/jpegxl_parse{, r}: use correct ISOBMFF extended size location Leo Izen
2023-11-27 14:10 ` [FFmpeg-devel] [PATCH v2 2/3] avcodec/jpegxl_parser: fix parsing sequences of extremely small files Leo Izen
@ 2023-11-27 14:10 ` Leo Izen
2023-12-03 14:45 ` [FFmpeg-devel] [PATCH v2 0/3] JPEG XL parser bug fixes Leo Izen
3 siblings, 0 replies; 5+ messages in thread
From: Leo Izen @ 2023-11-27 14:10 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Leo Izen
Add a fate test for the above commits fixing extremely small files or
files with extended box sizes.
Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
tests/fate/jxl.mak | 8 ++++++++
tests/ref/fate/jxl-small-ext-box | 9 +++++++++
2 files changed, 17 insertions(+)
create mode 100644 tests/ref/fate/jxl-small-ext-box
diff --git a/tests/fate/jxl.mak b/tests/fate/jxl.mak
index 057d3be0e1..d653eb644a 100644
--- a/tests/fate/jxl.mak
+++ b/tests/fate/jxl.mak
@@ -14,3 +14,11 @@ 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)
+
+# parser tests
+FATE_JPEGXL_PARSE += fate-jxl-small-ext-box
+fate-jxl-small-ext-box: CMD = framecrc -i $(TARGET_SAMPLES)/jxl/l.jxl -c copy
+
+FATE_JPEGXL_PARSE += $(FATE_JPEGXL_PARSE-yes)
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, IMAGE_JPEGXL_PIPE, , JPEGXL_PARSER) += $(FATE_JPEGXL_PARSE)
+fate-jxl-parse: $(FATE_JPEGXL_PARSE)
diff --git a/tests/ref/fate/jxl-small-ext-box b/tests/ref/fate/jxl-small-ext-box
new file mode 100644
index 0000000000..0f9adfe075
--- /dev/null
+++ b/tests/ref/fate/jxl-small-ext-box
@@ -0,0 +1,9 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: jpegxl
+#dimensions 0: 8x8
+#sar 0: 0/1
+0, 0, 0, 1, 104, 0xd12d1d10
+0, 1, 1, 1, 104, 0xd12d1d10
+0, 2, 2, 1, 104, 0xd12d1d10
+0, 3, 3, 1, 104, 0xd12d1d10
--
2.43.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] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2 0/3] JPEG XL parser bug fixes
2023-11-27 14:10 [FFmpeg-devel] [PATCH v2 0/3] JPEG XL parser bug fixes Leo Izen
` (2 preceding siblings ...)
2023-11-27 14:10 ` [FFmpeg-devel] [PATCH v2 3/3] fate/jpegxl: add parser test for extboxes and " Leo Izen
@ 2023-12-03 14:45 ` Leo Izen
3 siblings, 0 replies; 5+ messages in thread
From: Leo Izen @ 2023-12-03 14:45 UTC (permalink / raw)
To: FFmpeg Development
On 11/27/23 09:10, Leo Izen wrote:
> Two bug fixes related to the JPEG XL parser. They're not exactly related and
> don't need to be applied in sequence.
>
> v2 change: patches themselves are identical, but now there's a FATE test.
>
> Leo Izen (3):
> avcodec/jpegxl_parse{,r}: use correct ISOBMFF extended size location
> avcodec/jpegxl_parser: fix parsing sequences of extremely small files
> fate/jpegxl: add parser test for extboxes and small files
>
> libavcodec/jpegxl_parse.c | 6 +++---
> libavcodec/jpegxl_parser.c | 23 +++++++++++++++--------
> tests/fate/jxl.mak | 8 ++++++++
> tests/ref/fate/jxl-small-ext-box | 9 +++++++++
> 4 files changed, 35 insertions(+), 11 deletions(-)
> create mode 100644 tests/ref/fate/jxl-small-ext-box
>
Will apply soon.
- 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] 5+ messages in thread