Commit 0a9132b8 authored by Anton Khirnov's avatar Anton Khirnov

wnv1: cosmetics, reformat

parent 51648da4
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "mathops.h" #include "mathops.h"
typedef struct WNV1Context{ typedef struct WNV1Context {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame pic; AVFrame pic;
...@@ -38,10 +38,10 @@ typedef struct WNV1Context{ ...@@ -38,10 +38,10 @@ typedef struct WNV1Context{
GetBitContext gb; GetBitContext gb;
} WNV1Context; } WNV1Context;
static const 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}, { 0x1FD, 9 }, { 0xFD, 8 }, { 0x7D, 7 }, { 0x3D, 6 }, { 0x1D, 5 }, { 0x0D, 4 }, { 0x005, 3 },
{0x000,1}, { 0x000, 1 },
{0x004,3}, {0x0C,4}, {0x1C,5}, {0x3C,6}, {0x7C,7}, {0xFC,8}, {0x1FC,9}, {0xFF,8} { 0x004, 3 }, { 0x0C, 4 }, { 0x1C, 5 }, { 0x3C, 6 }, { 0x7C, 7 }, { 0xFC, 8 }, { 0x1FC, 9 }, { 0xFF, 8 }
}; };
#define CODE_VLC_BITS 9 #define CODE_VLC_BITS 9
...@@ -52,19 +52,19 @@ static inline int wnv1_get_code(WNV1Context *w, int base_value) ...@@ -52,19 +52,19 @@ static inline int wnv1_get_code(WNV1Context *w, int base_value)
{ {
int v = get_vlc2(&w->gb, code_vlc.table, CODE_VLC_BITS, 1); int v = get_vlc2(&w->gb, code_vlc.table, CODE_VLC_BITS, 1);
if(v==15) if (v == 15)
return ff_reverse[ get_bits(&w->gb, 8 - w->shift) ]; return ff_reverse[get_bits(&w->gb, 8 - w->shift)];
else else
return base_value + ((v - 7)<<w->shift); return base_value + ((v - 7) << w->shift);
} }
static int decode_frame(AVCodecContext *avctx, static int decode_frame(AVCodecContext *avctx,
void *data, int *got_frame, void *data, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
{ {
WNV1Context * const l = avctx->priv_data;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
WNV1Context * const l = avctx->priv_data;
AVFrame * const p = &l->pic; AVFrame * const p = &l->pic;
unsigned char *Y,*U,*V; unsigned char *Y,*U,*V;
int i, j; int i, j;
...@@ -72,12 +72,12 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -72,12 +72,12 @@ static int decode_frame(AVCodecContext *avctx,
uint8_t *rbuf; uint8_t *rbuf;
rbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE); rbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
if(!rbuf){ if (!rbuf) {
av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n"); av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
return -1; return -1;
} }
if(p->data[0]) if (p->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
p->reference = 0; p->reference = 0;
...@@ -88,9 +88,9 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -88,9 +88,9 @@ static int decode_frame(AVCodecContext *avctx,
} }
p->key_frame = 1; p->key_frame = 1;
for(i=8; i<buf_size; i++) for (i = 8; i < buf_size; i++)
rbuf[i]= ff_reverse[ buf[i] ]; rbuf[i] = ff_reverse[buf[i]];
init_get_bits(&l->gb, rbuf+8, (buf_size-8)*8); init_get_bits(&l->gb, rbuf + 8, (buf_size - 8) * 8);
if (buf[2] >> 4 == 6) if (buf[2] >> 4 == 6)
l->shift = 2; l->shift = 2;
...@@ -131,7 +131,8 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -131,7 +131,8 @@ static int decode_frame(AVCodecContext *avctx,
return buf_size; return buf_size;
} }
static av_cold int decode_init(AVCodecContext *avctx){ static av_cold int decode_init(AVCodecContext *avctx)
{
WNV1Context * const l = avctx->priv_data; WNV1Context * const l = avctx->priv_data;
static VLC_TYPE code_table[1 << CODE_VLC_BITS][2]; static VLC_TYPE code_table[1 << CODE_VLC_BITS][2];
...@@ -147,7 +148,8 @@ static av_cold int decode_init(AVCodecContext *avctx){ ...@@ -147,7 +148,8 @@ static av_cold int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
static av_cold int decode_end(AVCodecContext *avctx){ static av_cold int decode_end(AVCodecContext *avctx)
{
WNV1Context * const l = avctx->priv_data; WNV1Context * const l = avctx->priv_data;
AVFrame *pic = &l->pic; AVFrame *pic = &l->pic;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment