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;
return 0;
}
-static int bfi_decode_frame(AVCodecContext * avctx, void *data,
+static int bfi_decode_frame(AVCodecContext *avctx, void *data,
int *data_size, AVPacket *avpkt)
{
- const uint8_t *buf = avpkt->data, *buf_end = avpkt->data + avpkt->size;
+ GetByteContext g;
int buf_size = avpkt->size;
BFIContext *bfi = avctx->priv_data;
uint8_t *dst = bfi->dst;
return -1;
}
+ 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;
}
- 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;
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");
+ if (!bytestream2_get_bytes_left(&g)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Input resolution larger than actual frame.\n");
return -1;
}
/* 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<<lentab[code]) > frame_end)
+ if (dst + (length << lentab[code]) > frame_end)
break;
switch (code) {
case 0: //Normal Chain
- if (length >= buf_end - buf) {
+ if (length >= bytestream2_get_bytes_left(&g)) {
av_log(avctx, AV_LOG_ERROR, "Frame larger than buffer.\n");
return -1;
}
- bytestream_get_buffer(&buf, dst, length);
+ bytestream2_get_buffer(&g, dst, length);
dst += length;
break;
break;
case 3: //Fill Chain
- colour1 = bytestream_get_byte(&buf);
- colour2 = bytestream_get_byte(&buf);
+ colour1 = bytestream2_get_byte(&g);
+ colour2 = bytestream2_get_byte(&g);
while (length--) {
*dst++ = colour1;
*dst++ = colour2;
dst += bfi->frame.linesize[0];
}
*data_size = sizeof(AVFrame);
- *(AVFrame *) data = bfi->frame;
+ *(AVFrame *)data = bfi->frame;
return buf_size;
}