diff options
Diffstat (limited to 'libavcodec/fic.c')
| -rw-r--r-- | libavcodec/fic.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/libavcodec/fic.c b/libavcodec/fic.c index 8512ef3400..48e7a6ea0a 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -4,20 +4,20 @@ * Copyright (c) 2014 Konstantin Shishkov * Copyright (c) 2014 Derek Buitenhuis * - * 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 */ @@ -79,7 +79,7 @@ static const uint8_t fic_header[7] = { 0, 0, 1, 'F', 'I', 'C', 'V' }; #define FIC_HEADER_SIZE 27 -static av_always_inline void fic_idct(int16_t *blk, int step, int shift) +static av_always_inline void fic_idct(int16_t *blk, int step, int shift, int rnd) { const int t0 = 27246 * blk[3 * step] + 18405 * blk[5 * step]; const int t1 = 27246 * blk[5 * step] - 18405 * blk[3 * step]; @@ -91,8 +91,8 @@ static av_always_inline void fic_idct(int16_t *blk, int step, int shift) const int t7 = t3 - t1; const int t8 = 17734 * blk[2 * step] - 42813 * blk[6 * step]; const int t9 = 17734 * blk[6 * step] + 42814 * blk[2 * step]; - const int tA = (blk[0 * step] - blk[4 * step] << 15) + (1 << shift - 1); - const int tB = (blk[0 * step] + blk[4 * step] << 15) + (1 << shift - 1); + const int tA = (blk[0 * step] - blk[4 * step] << 15) + rnd; + const int tB = (blk[0 * step] + blk[4 * step] << 15) + rnd; blk[0 * step] = ( t4 + t9 + tB) >> shift; blk[1 * step] = ( t6 + t7 + t8 + tA) >> shift; blk[2 * step] = ( t6 - t7 - t8 + tA) >> shift; @@ -109,14 +109,15 @@ static void fic_idct_put(uint8_t *dst, int stride, int16_t *block) int16_t *ptr; ptr = block; - for (i = 0; i < 8; i++) { - fic_idct(ptr, 8, 13); + fic_idct(ptr++, 8, 13, (1 << 12) + (1 << 17)); + for (i = 1; i < 8; i++) { + fic_idct(ptr, 8, 13, 1 << 12); ptr++; } ptr = block; for (i = 0; i < 8; i++) { - fic_idct(ptr, 1, 20); + fic_idct(ptr, 1, 20, 0); ptr += 8; } @@ -265,10 +266,8 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data, int skip_cursor = 0; uint8_t *sdata; - if ((ret = ff_reget_buffer(avctx, ctx->frame)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + if ((ret = ff_reget_buffer(avctx, ctx->frame)) < 0) return ret; - } /* Header + at least one slice (4) */ if (avpkt->size < FIC_HEADER_SIZE + 4) { @@ -281,8 +280,13 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_WARNING, "Invalid FIC Header.\n"); /* Is it a skip frame? */ - if (src[17]) + if (src[17]) { + if (!ctx->final_frame) { + av_log(avctx, AV_LOG_WARNING, "Initial frame is skipped\n"); + return AVERROR_INVALIDDATA; + } goto skip; + } nslices = src[13]; if (!nslices) { @@ -302,7 +306,10 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - if (tsize < 32) { + if (!tsize) + skip_cursor = 1; + + if (!skip_cursor && tsize < 32) { av_log(avctx, AV_LOG_WARNING, "Cursor data too small. Skipping cursor.\n"); skip_cursor = 1; @@ -311,14 +318,14 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data, /* Cursor position. */ cur_x = AV_RL16(src + 33); cur_y = AV_RL16(src + 35); - if (cur_x > avctx->width || cur_y > avctx->height) { + if (!skip_cursor && (cur_x > avctx->width || cur_y > avctx->height)) { av_log(avctx, AV_LOG_WARNING, "Invalid cursor position: (%d,%d). Skipping cusor.\n", cur_x, cur_y); skip_cursor = 1; } - if (AV_RL16(src + 37) != 32 || AV_RL16(src + 39) != 32) { + if (!skip_cursor && (AV_RL16(src + 37) != 32 || AV_RL16(src + 39) != 32)) { av_log(avctx, AV_LOG_WARNING, "Invalid cursor size. Skipping cursor.\n"); skip_cursor = 1; |