RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-27 13:48:04 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/jpeg2000_parser: Fix parsing of tile-part header

Browse Source 
And frames where the end of frame marker is at the end of the buffer.

Signed-off-by: Shaun Simpson <shauns2029@gmail.com>
This commit is contained in:
Shaun Simpson 2021-07-21 16:30:09 +01:00 committed by Paul B Mahol
parent e41bd075dd
commit 01284c01c1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/jpeg2000_parser.c
View File

@ -42,7 +42,6 @@ typedef struct JPEG2000ParserContext {
uint8_t fheader_read; // are we reading uint8_t fheader_read; // are we reading
uint8_t reading_file_header; uint8_t reading_file_header;
uint8_t skipped_codestream; uint8_t skipped_codestream;
uint8_t codestream_frame_end;
uint8_t read_tp; uint8_t read_tp;
uint8_t in_codestream; uint8_t in_codestream;
} JPEG2000ParserContext; } JPEG2000ParserContext;
@ -57,7 +56,6 @@ static inline void reset_context(JPEG2000ParserContext *m)
m->ft = 0; m->ft = 0;
m->skipped_codestream = 0; m->skipped_codestream = 0;
m->fheader_read = 0; m->fheader_read = 0;
m->codestream_frame_end = 0;
m->skip_bytes = 0; m->skip_bytes = 0;
m->read_tp = 0; m->read_tp = 0;
m->in_codestream = 0; m->in_codestream = 0;
@ -100,16 +98,13 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
m->skip_bytes--; m->skip_bytes--;
continue; continue;
} }
if (m->codestream_frame_end) {
reset_context(m);
return i;
}
if (m->read_tp) { // Find out how many bytes inside Tile part codestream to skip. if (m->read_tp) { // Find out how many bytes inside Tile part codestream to skip.
if (m->read_tp == 1) { if (m->read_tp == 1) {
m->skip_bytes = (state64 & 0xFFFFFFFF) - 10 > 0? m->skip_bytes = (state64 & 0xFFFFFFFF) - 9 > 0?
(state64 & 0xFFFFFFFF) - 10 : 0; (state64 & 0xFFFFFFFF) - 9 : 0;
} }
m->read_tp--; m->read_tp--;
continue;
} }
if (m->fheader_read) { if (m->fheader_read) {
if (m->fheader_read == 1) { if (m->fheader_read == 1) {
@ -141,7 +136,8 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
if (pc->frame_start_found && m->ft == jp2_file) { if (pc->frame_start_found && m->ft == jp2_file) {
m->skipped_codestream = 1; m->skipped_codestream = 1;
} else if (pc->frame_start_found && m->ft == j2k_cstream) { } else if (pc->frame_start_found && m->ft == j2k_cstream) {
m->codestream_frame_end = 1; reset_context(m);
return i + 1; // End of frame detected, return frame size.
} }
m->in_codestream = 0; m->in_codestream = 0;
} else if (m->in_codestream && (state & 0xFFFF) == 0xFF90) { // Are we in tile part header? } else if (m->in_codestream && (state & 0xFFFF) == 0xFF90) { // Are we in tile part header?