X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Favs.c;h=7f8ff0f024e60b341b7527ab28afa05be23e9b7a;hb=b5d2bf964be338bf8e86a01619646332729b434e;hp=953aea1be055e9649781ed5132b8bba5092be225;hpb=b78e7197a81e193827cf2408fe25bc1f14843a72;p=ffmpeg diff --git a/libavcodec/avs.c b/libavcodec/avs.c index 953aea1be05..7f8ff0f024e 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -2,57 +2,61 @@ * AVS video decoder. * Copyright (c) 2006 Aurelien Jacobs * - * 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 - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avcodec.h" -#include "bitstream.h" +#include "get_bits.h" typedef struct { AVFrame picture; -} avs_context_t; +} AvsContext; typedef enum { AVS_VIDEO = 0x01, AVS_AUDIO = 0x02, AVS_PALETTE = 0x03, AVS_GAME_DATA = 0x04, -} avs_block_type_t; +} AvsBlockType; typedef enum { AVS_I_FRAME = 0x00, AVS_P_FRAME_3X3 = 0x01, AVS_P_FRAME_2X2 = 0x02, AVS_P_FRAME_2X3 = 0x03, -} avs_video_sub_type_t; +} AvsVideoSubType; static int avs_decode_frame(AVCodecContext * avctx, - void *data, int *data_size, uint8_t * buf, int buf_size) + void *data, int *data_size, AVPacket *avpkt) { - avs_context_t *const avs = avctx->priv_data; + const uint8_t *buf = avpkt->data; + const uint8_t *buf_end = avpkt->data + avpkt->size; + int buf_size = avpkt->size; + AvsContext *const avs = avctx->priv_data; AVFrame *picture = data; - AVFrame *const p = (AVFrame *) & avs->picture; - uint8_t *table, *vect, *out; + AVFrame *const p = &avs->picture; + const uint8_t *table, *vect; + uint8_t *out; int i, j, x, y, stride, vect_w = 3, vect_h = 3; - int sub_type; - avs_block_type_t type; + AvsVideoSubType sub_type; + AvsBlockType type; GetBitContext change_map; if (avctx->reget_buffer(avctx, p)) { @@ -60,12 +64,14 @@ avs_decode_frame(AVCodecContext * avctx, return -1; } p->reference = 1; - p->pict_type = FF_P_TYPE; + p->pict_type = AV_PICTURE_TYPE_P; p->key_frame = 0; out = avs->picture.data[0]; stride = avs->picture.linesize[0]; + if (buf_end - buf < 4) + return AVERROR_INVALIDDATA; sub_type = buf[0]; type = buf[1]; buf += 4; @@ -74,8 +80,10 @@ avs_decode_frame(AVCodecContext * avctx, int first, last; uint32_t *pal = (uint32_t *) avs->picture.data[1]; - first = LE_16(buf); - last = first + LE_16(buf + 2); + first = AV_RL16(buf); + last = first + AV_RL16(buf + 2); + if (first >= 256 || last > 256 || buf_end - buf < 4 + 4 + 3 * (last - first)) + return AVERROR_INVALIDDATA; buf += 4; for (i=first; ipict_type = FF_I_TYPE; + p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; case AVS_P_FRAME_3X3: vect_w = 3; @@ -111,16 +119,22 @@ avs_decode_frame(AVCodecContext * avctx, return -1; } + if (buf_end - buf < 256 * vect_w * vect_h) + return AVERROR_INVALIDDATA; table = buf + (256 * vect_w * vect_h); if (sub_type != AVS_I_FRAME) { int map_size = ((318 / vect_w + 7) / 8) * (198 / vect_h); - init_get_bits(&change_map, table, map_size); + if (buf_end - table < map_size) + return AVERROR_INVALIDDATA; + init_get_bits(&change_map, table, map_size * 8); table += map_size; } for (y=0; y<198; y+=vect_h) { for (x=0; x<318; x+=vect_w) { if (sub_type == AVS_I_FRAME || get_bits1(&change_map)) { + if (buf_end - table < 1) + return AVERROR_INVALIDDATA; vect = &buf[*table++ * (vect_w * vect_h)]; for (j=0; jpicture; + *picture = avs->picture; *data_size = sizeof(AVPicture); return buf_size; } -static int avs_decode_init(AVCodecContext * avctx) +static av_cold int avs_decode_init(AVCodecContext * avctx) { avctx->pix_fmt = PIX_FMT_PAL8; return 0; } -AVCodec avs_decoder = { - "avs", - CODEC_TYPE_VIDEO, - CODEC_ID_AVS, - sizeof(avs_context_t), - avs_decode_init, - NULL, - NULL, - avs_decode_frame, - CODEC_CAP_DR1, +static av_cold int avs_decode_end(AVCodecContext *avctx) +{ + AvsContext *s = avctx->priv_data; + if (s->picture.data[0]) + avctx->release_buffer(avctx, &s->picture); + return 0; +} + + +AVCodec ff_avs_decoder = { + .name = "avs", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_AVS, + .priv_data_size = sizeof(AvsContext), + .init = avs_decode_init, + .decode = avs_decode_frame, + .close = avs_decode_end, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), };