diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-04-27 14:08:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-04-27 22:36:46 +0200 |
| commit | 801939588999a5cfe8d2aeabe7114a09f892a1f4 (patch) | |
| tree | 99d79da9f1dfd8a4c3a614233362ebc898f90f71 /libavcodec/pnm_parser.c | |
| parent | 9fc1031ac2e8691e0140854d727b58cb62431b2b (diff) | |
| download | ffmpeg-801939588999a5cfe8d2aeabe7114a09f892a1f4.tar.gz | |
avcodec/pnm_parser: Remember the length already scanned for ascii images
Fixes: speed regression with xmap_samsung_gear_2560x1280.pgm
Found-by: Michael Koch
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/pnm_parser.c')
| -rw-r--r-- | libavcodec/pnm_parser.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index 210a8a048e..de0e32ba9c 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "parser.h" //for ParseContext @@ -27,6 +28,7 @@ typedef struct PNMParseContext { ParseContext pc; int remaining_bytes; + int ascii_scan; }PNMParseContext; static int pnm_parse(AVCodecParserContext *s, AVCodecContext *avctx, @@ -77,17 +79,28 @@ retry: } else if (pnmctx.type < 4) { uint8_t *bs = pnmctx.bytestream; const uint8_t *end = pnmctx.bytestream_end; + uint8_t *sync = bs; + + if (pc->index) { + av_assert0(pnmpc->ascii_scan <= end - bs); + bs += pnmpc->ascii_scan; + } while (bs < end) { - int c = *bs++; + int c; + sync = bs; + c = *bs++; if (c == '#') { while (c != '\n' && bs < end) c = *bs++; } else if (c == 'P') { next = bs - pnmctx.bytestream_start + skip - 1; + pnmpc->ascii_scan = 0; break; } } + if (next == END_NOT_FOUND) + pnmpc->ascii_scan = sync - pnmctx.bytestream + skip; } else { next = pnmctx.bytestream - pnmctx.bytestream_start + skip + av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); |