*/
/**
- * @file wnv1.c
+ * @file libavcodec/wnv1.c
* Winnov WNV1 codec.
*/
#include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
typedef struct WNV1Context{
GetBitContext gb;
} WNV1Context;
-static uint16_t code_tab[16][2]={
+static const uint16_t code_tab[16][2]={
{0x1FD,9}, {0xFD,8}, {0x7D,7}, {0x3D,6}, {0x1D,5}, {0x0D,4}, {0x005,3},
{0x000,1},
{0x004,3}, {0x0C,4}, {0x1C,5}, {0x3C,6}, {0x7C,7}, {0xFC,8}, {0x1FC,9}, {0xFF,8}
static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
WNV1Context * const l = avctx->priv_data;
AVFrame * const p= (AVFrame*)&l->pic;
unsigned char *Y,*U,*V;
int i, j;
int prev_y = 0, prev_u = 0, prev_v = 0;
+ uint8_t *rbuf;
+
+ rbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if(!rbuf){
+ av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
+ return -1;
+ }
if(p->data[0])
avctx->release_buffer(avctx, p);
p->reference = 0;
if(avctx->get_buffer(avctx, p) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ av_free(rbuf);
return -1;
}
p->key_frame = 1;
for(i=8; i<buf_size; i++)
- buf[i]= ff_reverse[ buf[i] ]; //FIXME ensure that the buffer is modifyable or use a temp one
- init_get_bits(&l->gb, buf+8, (buf_size-8)*8);
+ rbuf[i]= ff_reverse[ buf[i] ];
+ init_get_bits(&l->gb, rbuf+8, (buf_size-8)*8);
if (buf[2] >> 4 == 6)
l->shift = 2;
*data_size = sizeof(AVFrame);
*(AVFrame*)data = l->pic;
+ av_free(rbuf);
return buf_size;
}
static av_cold int decode_init(AVCodecContext *avctx){
WNV1Context * const l = avctx->priv_data;
+ static VLC_TYPE code_table[1 << CODE_VLC_BITS][2];
l->avctx = avctx;
avctx->pix_fmt = PIX_FMT_YUV422P;
- if(!code_vlc.table){
- init_vlc(&code_vlc, CODE_VLC_BITS, 16,
- &code_tab[0][1], 4, 2,
- &code_tab[0][0], 4, 2, 1);
- }
+ code_vlc.table = code_table;
+ code_vlc.table_allocated = 1 << CODE_VLC_BITS;
+ init_vlc(&code_vlc, CODE_VLC_BITS, 16,
+ &code_tab[0][1], 4, 2,
+ &code_tab[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
return 0;
}