[FFmpeg-cvslog] libavcodec/jpeg2000_parser: Localize m->bytes_read

Tomas Härdin git at videolan.org
Fri Jun 10 12:12:04 EEST 2022


ffmpeg | branch: master | Tomas Härdin <git at haerdin.se> | Fri May 20 14:50:00 2022 +0200| [cb204f007be4b0cb32ec32b08f2fdfd798d339ea] | committer: Tomas Härdin

libavcodec/jpeg2000_parser: Localize m->bytes_read

Another 6%

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb204f007be4b0cb32ec32b08f2fdfd798d339ea
---

 libavcodec/jpeg2000_parser.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/jpeg2000_parser.c b/libavcodec/jpeg2000_parser.c
index 7725d4d252..e96efc28ed 100644
--- a/libavcodec/jpeg2000_parser.c
+++ b/libavcodec/jpeg2000_parser.c
@@ -95,6 +95,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
     ParseContext *pc= &m->pc;
     int i;
     uint64_t state64 = pc->state64;
+    uint64_t bytes_read = m->bytes_read;
 
     if (buf_size == 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++) {
         state64 = state64 << 8 | buf[i];
-        m->bytes_read++;
+        bytes_read++;
         if (m->skip_bytes) {
             // handle long skips
             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) {
                     m->skip_bytes -= skip;
                     i += skip;
-                    m->bytes_read += skip;
+                    bytes_read += skip;
                 }
             }
             m->skip_bytes--;
@@ -141,7 +142,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
             }
             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;
         } else if ((state64 & 0xFFFF) == 0xFF4F) {
             m->in_codestream = 1;
@@ -180,6 +181,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
     }
 
     pc->state64 = state64;
+    m->bytes_read = bytes_read;
     return END_NOT_FOUND;
 }
 



More information about the ffmpeg-cvslog mailing list