X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fbfi.c;h=1971c0c8554ad8e206a993422932c44cd9437828;hb=de16f08e48a2e0dbd7311882d97fe379535c5a48;hp=c97dfe2dc08f0410105e19eb214dd54e83ecfd10;hpb=975a1447f76e8d30fc01e6ea5466c84faf3d76e4;p=ffmpeg diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index c97dfe2dc08..1971c0c8554 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -23,12 +23,13 @@ * @file * @brief Brute Force & Ignorance (.bfi) video decoder * @author Sisir Koppaka ( sisir.koppaka at gmail dot com ) - * @sa http://wiki.multimedia.cx/index.php?title=BFI + * @see http://wiki.multimedia.cx/index.php?title=BFI */ #include "libavutil/common.h" #include "avcodec.h" #include "bytestream.h" +#include "internal.h" typedef struct BFIContext { AVCodecContext *avctx; @@ -36,53 +37,54 @@ typedef struct BFIContext { uint8_t *dst; } BFIContext; -static av_cold int bfi_decode_init(AVCodecContext * avctx) +static av_cold int bfi_decode_init(AVCodecContext *avctx) { BFIContext *bfi = avctx->priv_data; - avctx->pix_fmt = PIX_FMT_PAL8; - bfi->dst = av_mallocz(avctx->width * avctx->height); + avctx->pix_fmt = AV_PIX_FMT_PAL8; + bfi->dst = av_mallocz(avctx->width * avctx->height); return 0; } -static int bfi_decode_frame(AVCodecContext * avctx, void *data, - int *data_size, AVPacket *avpkt) +static int bfi_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data, *buf_end = avpkt->data + avpkt->size; - int buf_size = avpkt->size; + GetByteContext g; + int buf_size = avpkt->size; BFIContext *bfi = avctx->priv_data; - uint8_t *dst = bfi->dst; + uint8_t *dst = bfi->dst; uint8_t *src, *dst_offset, colour1, colour2; uint8_t *frame_end = bfi->dst + avctx->width * avctx->height; uint32_t *pal; - int i, j, height = avctx->height; + int i, j, ret, height = avctx->height; if (bfi->frame.data[0]) avctx->release_buffer(avctx, &bfi->frame); bfi->frame.reference = 1; - if (avctx->get_buffer(avctx, &bfi->frame) < 0) { + if ((ret = ff_get_buffer(avctx, &bfi->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } + bytestream2_init(&g, avpkt->data, buf_size); + /* Set frame parameters and palette, if necessary */ if (!avctx->frame_number) { bfi->frame.pict_type = AV_PICTURE_TYPE_I; bfi->frame.key_frame = 1; /* Setting the palette */ - if(avctx->extradata_size>768) { + if (avctx->extradata_size > 768) { av_log(NULL, AV_LOG_ERROR, "Palette is too large.\n"); - return -1; + return AVERROR_INVALIDDATA; } - pal = (uint32_t *) bfi->frame.data[1]; + pal = (uint32_t *)bfi->frame.data[1]; for (i = 0; i < avctx->extradata_size / 3; i++) { int shift = 16; *pal = 0; for (j = 0; j < 3; j++, shift -= 8) - *pal += - ((avctx->extradata[i * 3 + j] << 2) | - (avctx->extradata[i * 3 + j] >> 4)) << shift; + *pal += ((avctx->extradata[i * 3 + j] << 2) | + (avctx->extradata[i * 3 + j] >> 4)) << shift; pal++; } bfi->frame.palette_has_changed = 1; @@ -91,71 +93,67 @@ static int bfi_decode_frame(AVCodecContext * avctx, void *data, bfi->frame.key_frame = 0; } - buf += 4; //Unpacked size, not required. + bytestream2_skip(&g, 4); // Unpacked size, not required. while (dst != frame_end) { - static const uint8_t lentab[4]={0,2,0,1}; - unsigned int byte = *buf++, av_uninit(offset); - unsigned int code = byte >> 6; + static const uint8_t lentab[4] = { 0, 2, 0, 1 }; + unsigned int byte = bytestream2_get_byte(&g), av_uninit(offset); + unsigned int code = byte >> 6; unsigned int length = byte & ~0xC0; - if (buf >= buf_end) { - av_log(avctx, AV_LOG_ERROR, "Input resolution larger than actual frame.\n"); - return -1; + if (!bytestream2_get_bytes_left(&g)) { + av_log(avctx, AV_LOG_ERROR, + "Input resolution larger than actual frame.\n"); + return AVERROR_INVALIDDATA; } - /* Get length and offset(if required) */ + /* Get length and offset (if required) */ if (length == 0) { if (code == 1) { - length = bytestream_get_byte(&buf); - offset = bytestream_get_le16(&buf); + length = bytestream2_get_byte(&g); + offset = bytestream2_get_le16(&g); } else { - length = bytestream_get_le16(&buf); + length = bytestream2_get_le16(&g); if (code == 2 && length == 0) break; } } else { if (code == 1) - offset = bytestream_get_byte(&buf); + offset = bytestream2_get_byte(&g); } /* Do boundary check */ - if (dst + (length< frame_end) + if (dst + (length << lentab[code]) > frame_end) break; switch (code) { - - case 0: //Normal Chain - if (length >= buf_end - buf) { + case 0: // normal chain + if (length >= bytestream2_get_bytes_left(&g)) { av_log(avctx, AV_LOG_ERROR, "Frame larger than buffer.\n"); - return -1; + return AVERROR_INVALIDDATA; } - bytestream_get_buffer(&buf, dst, length); + bytestream2_get_buffer(&g, dst, length); dst += length; break; - - case 1: //Back Chain + case 1: // back chain dst_offset = dst - offset; - length *= 4; //Convert dwords to bytes. + length *= 4; // Convert dwords to bytes. if (dst_offset < bfi->dst) break; while (length--) *dst++ = *dst_offset++; break; - - case 2: //Skip Chain + case 2: // skip chain dst += length; break; - - case 3: //Fill Chain - colour1 = bytestream_get_byte(&buf); - colour2 = bytestream_get_byte(&buf); + case 3: // fill chain + colour1 = bytestream2_get_byte(&g); + colour2 = bytestream2_get_byte(&g); while (length--) { *dst++ = colour1; *dst++ = colour2; } break; - } } @@ -166,12 +164,12 @@ static int bfi_decode_frame(AVCodecContext * avctx, void *data, src += avctx->width; dst += bfi->frame.linesize[0]; } - *data_size = sizeof(AVFrame); - *(AVFrame *) data = bfi->frame; + *got_frame = 1; + *(AVFrame *)data = bfi->frame; return buf_size; } -static av_cold int bfi_decode_close(AVCodecContext * avctx) +static av_cold int bfi_decode_close(AVCodecContext *avctx) { BFIContext *bfi = avctx->priv_data; if (bfi->frame.data[0]) @@ -181,13 +179,13 @@ static av_cold int bfi_decode_close(AVCodecContext * avctx) } AVCodec ff_bfi_decoder = { - .name = "bfi", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_BFI, + .name = "bfi", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_BFI, .priv_data_size = sizeof(BFIContext), - .init = bfi_decode_init, - .close = bfi_decode_close, - .decode = bfi_decode_frame, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), + .init = bfi_decode_init, + .close = bfi_decode_close, + .decode = bfi_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), };