X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvb.c;h=56094d8b9d4ed0da454e71c19a289cf61e7ebfe3;hb=b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f;hp=7a2e0070560352f95594e2e53c8bc71e08604e95;hpb=7993df65275a9a9bf0a04c37d1aa31901d3ebb0c;p=ffmpeg diff --git a/libavcodec/vb.c b/libavcodec/vb.c index 7a2e0070560..56094d8b9d4 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -2,25 +2,25 @@ * Beam Software VB decoder * Copyright (c) 2007 Konstantin Shishkov * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file vb.c + * @file * VB Video decoder */ @@ -29,8 +29,9 @@ #include "avcodec.h" #include "bytestream.h" +#include "internal.h" -enum VBFlags{ +enum VBFlags { VB_HAS_GMC = 0x01, VB_HAS_AUDIO = 0x04, VB_HAS_VIDEO = 0x08, @@ -40,11 +41,10 @@ enum VBFlags{ typedef struct VBDecContext { AVCodecContext *avctx; - AVFrame pic; uint8_t *frame, *prev_frame; - uint32_t pal[256]; - const uint8_t *stream; + uint32_t pal[AVPALETTE_COUNT]; + GetByteContext stream; } VBDecContext; static const uint16_t vb_patterns[64] = { @@ -58,18 +58,22 @@ static const uint16_t vb_patterns[64] = { 0xC631, 0x6310, 0xC060, 0x0136, 0x136C, 0x36C8, 0x6C80, 0x324C }; -static void vb_decode_palette(VBDecContext *c) +static void vb_decode_palette(VBDecContext *c, int data_size) { int start, size, i; - start = bytestream_get_byte(&c->stream); - size = (bytestream_get_byte(&c->stream) - 1) & 0xFF; - if(start + size > 255){ + start = bytestream2_get_byte(&c->stream); + size = (bytestream2_get_byte(&c->stream) - 1) & 0xFF; + if (start + size > 255) { av_log(c->avctx, AV_LOG_ERROR, "Palette change runs beyond entry 256\n"); return; } - for(i = start; i <= start + size; i++) - c->pal[i] = bytestream_get_be24(&c->stream); + if (size*3+2 > data_size) { + av_log(c->avctx, AV_LOG_ERROR, "Palette data runs beyond chunk size\n"); + return; + } + for (i = start; i <= start + size; i++) + c->pal[i] = bytestream2_get_be24(&c->stream); } static inline int check_pixel(uint8_t *buf, uint8_t *start, uint8_t *end) @@ -82,8 +86,9 @@ static inline int check_line(uint8_t *buf, uint8_t *start, uint8_t *end) return buf >= start && (buf + 4) <= end; } -static int vb_decode_framedata(VBDecContext *c, const uint8_t *buf, int offset) +static int vb_decode_framedata(VBDecContext *c, int offset) { + GetByteContext g; uint8_t *prev, *cur; int blk, blocks, t, blk2; int blocktypes = 0; @@ -91,72 +96,78 @@ static int vb_decode_framedata(VBDecContext *c, const uint8_t *buf, int offset) int pattype, pattern; const int width = c->avctx->width; uint8_t *pstart = c->prev_frame; - uint8_t *pend = c->prev_frame + width*c->avctx->height; + uint8_t *pend = c->prev_frame + width*c->avctx->height; + + g = c->stream; prev = c->prev_frame + offset; - cur = c->frame; + cur = c->frame; blocks = (c->avctx->width >> 2) * (c->avctx->height >> 2); - blk2 = 0; - for(blk = 0; blk < blocks; blk++){ - if(!(blk & 3)) - blocktypes = bytestream_get_byte(&buf); - switch(blocktypes & 0xC0){ + blk2 = 0; + for (blk = 0; blk < blocks; blk++) { + if (!(blk & 3)) { + blocktypes = bytestream2_get_byte(&g); + } + switch (blocktypes & 0xC0) { case 0x00: //skip - for(y = 0; y < 4; y++) - if(check_line(prev + y*width, pstart, pend)) + for (y = 0; y < 4; y++) + if (check_line(prev + y*width, pstart, pend)) memcpy(cur + y*width, prev + y*width, 4); else memset(cur + y*width, 0, 4); break; case 0x40: - t = bytestream_get_byte(&buf); - if(!t){ //raw block - for(y = 0; y < 4; y++) - memcpy(cur + y*width, buf + y*4, 4); - buf += 16; - }else{ // motion compensation + t = bytestream2_get_byte(&g); + if (!t) { //raw block + if (bytestream2_get_bytes_left(&g) < 16) { + av_log(c->avctx, AV_LOG_ERROR, "Insufficient data\n"); + return AVERROR_INVALIDDATA; + } + for (y = 0; y < 4; y++) + bytestream2_get_buffer(&g, cur + y * width, 4); + } else { // motion compensation x = ((t & 0xF)^8) - 8; y = ((t >> 4) ^8) - 8; t = x + y*width; - for(y = 0; y < 4; y++) - if(check_line(prev + t + y*width, pstart, pend)) + for (y = 0; y < 4; y++) + if (check_line(prev + t + y*width, pstart, pend)) memcpy(cur + y*width, prev + t + y*width, 4); else memset(cur + y*width, 0, 4); } break; case 0x80: // fill - t = bytestream_get_byte(&buf); - for(y = 0; y < 4; y++) + t = bytestream2_get_byte(&g); + for (y = 0; y < 4; y++) memset(cur + y*width, t, 4); break; case 0xC0: // pattern fill - t = bytestream_get_byte(&buf); + t = bytestream2_get_byte(&g); pattype = t >> 6; pattern = vb_patterns[t & 0x3F]; - switch(pattype){ + switch (pattype) { case 0: - a = bytestream_get_byte(&buf); - b = bytestream_get_byte(&buf); - for(y = 0; y < 4; y++) - for(x = 0; x < 4; x++, pattern >>= 1) + a = bytestream2_get_byte(&g); + b = bytestream2_get_byte(&g); + for (y = 0; y < 4; y++) + for (x = 0; x < 4; x++, pattern >>= 1) cur[x + y*width] = (pattern & 1) ? b : a; break; case 1: pattern = ~pattern; case 2: - a = bytestream_get_byte(&buf); - for(y = 0; y < 4; y++) - for(x = 0; x < 4; x++, pattern >>= 1) - if(pattern & 1 && check_pixel(prev + x + y*width, pstart, pend)) + a = bytestream2_get_byte(&g); + for (y = 0; y < 4; y++) + for (x = 0; x < 4; x++, pattern >>= 1) + if (pattern & 1 && check_pixel(prev + x + y*width, pstart, pend)) cur[x + y*width] = prev[x + y*width]; else cur[x + y*width] = a; break; case 3: - av_log(c->avctx, AV_LOG_ERROR, "Invalid opcode seen @%d\n",blk); - return -1; + av_log(c->avctx, AV_LOG_ERROR, "Invalid opcode seen @%d\n", blk); + return AVERROR_INVALIDDATA; } break; } @@ -164,8 +175,8 @@ static int vb_decode_framedata(VBDecContext *c, const uint8_t *buf, int offset) cur += 4; prev += 4; blk2++; - if(blk2 == (width >> 2)){ - blk2 = 0; + if (blk2 == (width >> 2)) { + blk2 = 0; cur += width * 3; prev += width * 3; } @@ -173,110 +184,92 @@ static int vb_decode_framedata(VBDecContext *c, const uint8_t *buf, int offset) return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt) { VBDecContext * const c = avctx->priv_data; + AVFrame *frame = data; uint8_t *outptr, *srcptr; - int i, j; + int i, j, ret; int flags; uint32_t size; - int rest = buf_size; int offset = 0; - c->stream = buf; - flags = bytestream_get_le16(&c->stream); - rest -= 2; + bytestream2_init(&c->stream, avpkt->data, avpkt->size); + + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return ret; + } + + flags = bytestream2_get_le16(&c->stream); - if(flags & VB_HAS_GMC){ - i = (int16_t)bytestream_get_le16(&c->stream); - j = (int16_t)bytestream_get_le16(&c->stream); + if (flags & VB_HAS_GMC) { + i = (int16_t)bytestream2_get_le16(&c->stream); + j = (int16_t)bytestream2_get_le16(&c->stream); offset = i + j * avctx->width; - rest -= 4; } - if(flags & VB_HAS_VIDEO){ - size = bytestream_get_le32(&c->stream); - if(size > rest){ - av_log(avctx, AV_LOG_ERROR, "Frame size is too big\n"); - return -1; - } - vb_decode_framedata(c, c->stream, offset); - c->stream += size - 4; - rest -= size; + if (flags & VB_HAS_VIDEO) { + size = bytestream2_get_le32(&c->stream); + vb_decode_framedata(c, offset); + bytestream2_skip(&c->stream, size - 4); } - if(flags & VB_HAS_PALETTE){ - size = bytestream_get_le32(&c->stream); - if(size > rest){ - av_log(avctx, AV_LOG_ERROR, "Palette size is too big\n"); - return -1; - } - vb_decode_palette(c); - rest -= size; + if (flags & VB_HAS_PALETTE) { + size = bytestream2_get_le32(&c->stream); + vb_decode_palette(c, size); } - memcpy(c->pic.data[1], c->pal, AVPALETTE_SIZE); - c->pic.palette_has_changed = flags & VB_HAS_PALETTE; + memcpy(frame->data[1], c->pal, AVPALETTE_SIZE); + frame->palette_has_changed = flags & VB_HAS_PALETTE; - outptr = c->pic.data[0]; + outptr = frame->data[0]; srcptr = c->frame; - for(i = 0; i < avctx->height; i++){ + for (i = 0; i < avctx->height; i++) { memcpy(outptr, srcptr, avctx->width); srcptr += avctx->width; - outptr += c->pic.linesize[0]; + outptr += frame->linesize[0]; } FFSWAP(uint8_t*, c->frame, c->prev_frame); - *data_size = sizeof(AVFrame); - *(AVFrame*)data = c->pic; + *got_frame = 1; /* always report that the buffer was completely consumed */ - return buf_size; + return avpkt->size; } -static int decode_init(AVCodecContext *avctx) +static av_cold int decode_init(AVCodecContext *avctx) { VBDecContext * const c = avctx->priv_data; - c->avctx = avctx; - avctx->pix_fmt = PIX_FMT_PAL8; - - if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { - return -1; - } - - c->pic.reference = 1; - if(avctx->get_buffer(avctx, &c->pic) < 0){ - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; - } + c->avctx = avctx; + avctx->pix_fmt = AV_PIX_FMT_PAL8; - c->frame = av_malloc( avctx->width * avctx->height); - c->prev_frame = av_malloc( avctx->width * avctx->height); + c->frame = av_mallocz(avctx->width * avctx->height); + c->prev_frame = av_mallocz(avctx->width * avctx->height); return 0; } -static int decode_end(AVCodecContext *avctx) +static av_cold int decode_end(AVCodecContext *avctx) { VBDecContext *c = avctx->priv_data; av_freep(&c->frame); av_freep(&c->prev_frame); - if(c->pic.data[0]) - avctx->release_buffer(avctx, &c->pic); return 0; } -AVCodec vb_decoder = { - "vb", - CODEC_TYPE_VIDEO, - CODEC_ID_VB, - sizeof(VBDecContext), - decode_init, - NULL, - decode_end, - decode_frame +AVCodec ff_vb_decoder = { + .name = "vb", + .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VB, + .priv_data_size = sizeof(VBDecContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, }; -