virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

libavcodec/jpeg2000_parser: Localize m->bytes_read

Browse Source 
Another 6%
This commit is contained in:
Tomas Härdin 2022-05-20 14:50:00 +02:00
parent ffc2d95674
commit cb204f007b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/jpeg2000_parser.c
View File

@ -95,6 +95,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
ParseContext *pc= &m->pc; ParseContext *pc= &m->pc;
int i; int i;
uint64_t state64 = pc->state64; uint64_t state64 = pc->state64;
uint64_t bytes_read = m->bytes_read;
if (buf_size == 0) { if (buf_size == 0) {
return 0; return 0;
@ -102,7 +103,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
for (i = 0; i < buf_size; i++) { for (i = 0; i < buf_size; i++) {
state64 = state64 << 8 | buf[i]; state64 = state64 << 8 | buf[i];
m->bytes_read++; bytes_read++;
if (m->skip_bytes) { if (m->skip_bytes) {
// handle long skips // handle long skips
if (m->skip_bytes > 8) { if (m->skip_bytes > 8) {
@ -112,7 +113,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
if (skip > 0) { if (skip > 0) {
m->skip_bytes -= skip; m->skip_bytes -= skip;
i += skip; i += skip;
m->bytes_read += skip; bytes_read += skip;
} }
} }
m->skip_bytes--; m->skip_bytes--;
@ -141,7 +142,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
} }
m->fheader_read--; m->fheader_read--;
} }
if ((state64 & 0xFFFFFFFF) == 0x0000000C && m->bytes_read >= 3) { // Indicates start of JP2 file. Check signature next. if ((state64 & 0xFFFFFFFF) == 0x0000000C && bytes_read >= 3) { // Indicates start of JP2 file. Check signature next.
m->fheader_read = 8; m->fheader_read = 8;
} else if ((state64 & 0xFFFF) == 0xFF4F) { } else if ((state64 & 0xFFFF) == 0xFF4F) {
m->in_codestream = 1; m->in_codestream = 1;
@ -180,6 +181,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
} }
pc->state64 = state64; pc->state64 = state64;
m->bytes_read = bytes_read;
return END_NOT_FOUND; return END_NOT_FOUND;
} }