X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Featgv.c;h=34b79af5aeed7a9bcde30bbf1de9bb554f99cae6;hb=d526c5338d50d12a54fd95130030c60070707d3e;hp=0b72dffa0c487d8ef2f0ee69c45d92d341b6102f;hpb=e29a95b1b86cfa0ca320267e66d8b49821fc11ad;p=ffmpeg diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 0b72dffa0c4..34b79af5aee 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -2,36 +2,37 @@ * Electronic Arts TGV Video Decoder * Copyright (c) 2007-2008 Peter Ross * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file eatgv.c + * @file * Electronic Arts TGV Video Decoder - * by Peter Ross (suxen_drol at hotmail dot com) + * by Peter Ross (pross@xvid.org) * * Technical details here: * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV */ #include "avcodec.h" -#define ALT_BITSTREAM_READER_LE -#include "bitstream.h" +#define BITSTREAM_READER_LE +#include "get_bits.h" #include "libavutil/lzo.h" +#include "libavutil/imgutils.h" #define EA_PREAMBLE_SIZE 8 #define kVGT_TAG MKTAG('k', 'V', 'G', 'T') @@ -63,7 +64,7 @@ static av_cold int tgv_decode_init(AVCodecContext *avctx){ */ static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst, int width, int height) { unsigned char *dst_end = dst + width*height; - int size,size1,size2,offset,run; + int size, size1, size2, offset, run; unsigned char *dst_start = dst; if (src[0] & 0x01) @@ -154,7 +155,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b vector_bits = AV_RL16(&buf[6]); buf += 12; - /* allocate codebook buffers as neccessary */ + /* allocate codebook buffers as necessary */ if (num_mvs > s->num_mvs) { s->mv_codebook = av_realloc(s->mv_codebook, num_mvs*2*sizeof(int)); s->num_mvs = num_mvs; @@ -192,6 +193,10 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b s->block_codebook[i][15-j] = tmp[get_bits(&gb, 2)]; } + if (get_bits_left(&gb) < vector_bits * + (s->avctx->height/4) * (s->avctx->width/4)) + return -1; + /* read vectors and build frame */ for(y=0; yavctx->height/4; y++) for(x=0; xavctx->width/4; x++) { @@ -237,8 +242,10 @@ static void cond_release_buffer(AVFrame *pic) static int tgv_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TgvContext *s = avctx->priv_data; const uint8_t *buf_end = buf + buf_size; int chunk_type; @@ -269,7 +276,7 @@ static int tgv_decode_frame(AVCodecContext *avctx, } } - if (avcodec_check_dimensions(avctx, s->width, s->height)) + if (av_image_check_size(s->width, s->height, 0, avctx)) return -1; /* shuffle */ @@ -279,21 +286,21 @@ static int tgv_decode_frame(AVCodecContext *avctx, s->frame.buffer_hints = FF_BUFFER_HINTS_VALID; s->frame.linesize[0] = s->width; - /* allocate additional 12 bytes to accomodate av_memcpy_backptr() OUTBUF_PADDED optimisation */ + /* allocate additional 12 bytes to accommodate av_memcpy_backptr() OUTBUF_PADDED optimisation */ s->frame.data[0] = av_malloc(s->width*s->height + 12); if (!s->frame.data[0]) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); s->frame.data[1] = av_malloc(AVPALETTE_SIZE); if (!s->frame.data[1]) { av_freep(&s->frame.data[0]); - return AVERROR_NOMEM; + return AVERROR(ENOMEM); } } memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE); if(chunk_type==kVGT_TAG) { s->frame.key_frame = 1; - s->frame.pict_type = FF_I_TYPE; + s->frame.pict_type = AV_PICTURE_TYPE_I; if (unpack(buf, buf_end, s->frame.data[0], s->avctx->width, s->avctx->height)<0) { av_log(avctx, AV_LOG_WARNING, "truncated intra frame\n"); return -1; @@ -304,7 +311,7 @@ static int tgv_decode_frame(AVCodecContext *avctx, return buf_size; } s->frame.key_frame = 0; - s->frame.pict_type = FF_P_TYPE; + s->frame.pict_type = AV_PICTURE_TYPE_P; if (tgv_decode_inter(s, buf, buf_end)<0) { av_log(avctx, AV_LOG_WARNING, "truncated inter frame\n"); return -1; @@ -327,14 +334,13 @@ static av_cold int tgv_decode_end(AVCodecContext *avctx) return 0; } -AVCodec eatgv_decoder = { - "eatgv", - CODEC_TYPE_VIDEO, - CODEC_ID_TGV, - sizeof(TgvContext), - tgv_decode_init, - NULL, - tgv_decode_end, - tgv_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV Video"), +AVCodec ff_eatgv_decoder = { + .name = "eatgv", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_TGV, + .priv_data_size = sizeof(TgvContext), + .init = tgv_decode_init, + .close = tgv_decode_end, + .decode = tgv_decode_frame, + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"), };