diff options
Diffstat (limited to 'libavcodec/bmp_parser.c')
-rw-r--r-- | libavcodec/bmp_parser.c | 57 |
1 files changed, 39 insertions, 18 deletions
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c index b85dd8b..cd65f02 100644 --- a/libavcodec/bmp_parser.c +++ b/libavcodec/bmp_parser.c @@ -2,20 +2,20 @@ * BMP parser * Copyright (c) 2012 Paul B Mahol * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -45,21 +45,37 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext *avctx, int i = 0; *poutbuf_size = 0; - if (buf_size == 0) - return 0; - if (!bpc->pc.frame_start_found) { +restart: + if (bpc->pc.frame_start_found <= 2+4+4) { for (; i < buf_size; i++) { state = (state << 8) | buf[i]; - if ((state >> 48) == (('B' << 8) | 'M')) { - bpc->fsize = av_bswap32(state >> 16); - bpc->pc.frame_start_found = 1; - if (bpc->fsize > buf_size - i + 7) - bpc->remaining_size = bpc->fsize - buf_size + i - 7; - else - next = bpc->fsize + i - 7; - break; - } + if (bpc->pc.frame_start_found == 0) { + if ((state >> 48) == (('B' << 8) | 'M')) { + bpc->fsize = av_bswap32(state >> 16); + if (bpc->fsize > 17) + bpc->pc.frame_start_found = 1; + } + } else if (bpc->pc.frame_start_found == 2+4+4) { +// unsigned hsize = av_bswap32(state>>32); + unsigned ihsize = av_bswap32(state); + if (ihsize < 12 || ihsize > 200) { + bpc->pc.frame_start_found = 0; + continue; + } + bpc->pc.frame_start_found++; + bpc->remaining_size = bpc->fsize + i - 17; + + if (bpc->pc.index + i > 17) { + next = i - 17; + state = 0; + break; + } else { + bpc->pc.state64 = 0; + goto restart; + } + } else if (bpc->pc.frame_start_found) + bpc->pc.frame_start_found++; } bpc->pc.state64 = state; } else { @@ -68,7 +84,9 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext *avctx, bpc->remaining_size -= i; if (bpc->remaining_size) goto flush; - next = i; + + bpc->pc.frame_start_found = 0; + goto restart; } } @@ -76,7 +94,10 @@ flush: if (ff_combine_frame(&bpc->pc, next, &buf, &buf_size) < 0) return buf_size; - bpc->pc.frame_start_found = 0; + if (next != END_NOT_FOUND && next < 0) + bpc->pc.frame_start_found = FFMAX(bpc->pc.frame_start_found - i - 1, 0); + else + bpc->pc.frame_start_found = 0; *poutbuf = buf; *poutbuf_size = buf_size; |