* Winnov WNV1 codec.
*/
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
-#include "mathops.h"
typedef struct WNV1Context {
} WNV1Context;
static const uint16_t code_tab[16][2] = {
- { 0x1FD, 9 }, { 0xFD, 8 }, { 0x7D, 7 }, { 0x3D, 6 }, { 0x1D, 5 }, { 0x0D, 4 }, { 0x005, 3 },
+ { 0x17F, 9 }, { 0xBF, 8 }, { 0x5F, 7 }, { 0x2F, 6 }, { 0x17, 5 }, { 0x0B, 4 }, { 0x005, 3 },
{ 0x000, 1 },
- { 0x004, 3 }, { 0x0C, 4 }, { 0x1C, 5 }, { 0x3C, 6 }, { 0x7C, 7 }, { 0xFC, 8 }, { 0x1FC, 9 }, { 0xFF, 8 }
+ { 0x01, 3 }, { 0x03, 4 }, { 0x07, 5 }, { 0x0F, 6 }, { 0x1F, 7 }, { 0x3F, 8 }, { 0x07F, 9 }, { 0xFF, 8 }
};
#define CODE_VLC_BITS 9
int v = get_vlc2(&w->gb, code_vlc.table, CODE_VLC_BITS, 1);
if (v == 15)
- return ff_reverse[get_bits(&w->gb, 8 - w->shift)];
+ return get_bits(&w->gb, 8 - w->shift) << w->shift;
else
return base_value + ((v - 7U) << w->shift);
}
unsigned char *Y,*U,*V;
int i, j, ret;
int prev_y = 0, prev_u = 0, prev_v = 0;
- uint8_t *rbuf;
if (buf_size < 8 + avctx->height * (avctx->width/2)/8) {
av_log(avctx, AV_LOG_ERROR, "Packet size %d is too small\n", buf_size);
return AVERROR_INVALIDDATA;
}
- rbuf = av_malloc(buf_size + AV_INPUT_BUFFER_PADDING_SIZE);
- if (!rbuf) {
- av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
- return AVERROR(ENOMEM);
- }
- memset(rbuf + buf_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-
- if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
- av_free(rbuf);
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
return ret;
- }
p->key_frame = 1;
- for (i = 8; i < buf_size; i++)
- rbuf[i] = ff_reverse[buf[i]];
-
- if ((ret = init_get_bits8(&l->gb, rbuf + 8, buf_size - 8)) < 0)
+ if ((ret = init_get_bits8(&l->gb, buf + 8, buf_size - 8)) < 0)
return ret;
if (buf[2] >> 4 == 6)
*got_frame = 1;
- av_free(rbuf);
return buf_size;
}
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);
+ &code_tab[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
return 0;
}