From 0a9132b84c0590500bb3d6b358219323805993fc Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 16 Nov 2012 18:42:16 +0100 Subject: [PATCH] wnv1: cosmetics, reformat --- libavcodec/wnv1.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 9021ec6a62..1636f16510 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -30,7 +30,7 @@ #include "mathops.h" -typedef struct WNV1Context{ +typedef struct WNV1Context { AVCodecContext *avctx; AVFrame pic; @@ -38,10 +38,10 @@ typedef struct WNV1Context{ GetBitContext gb; } WNV1Context; -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 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 } }; #define CODE_VLC_BITS 9 @@ -52,32 +52,32 @@ static inline int wnv1_get_code(WNV1Context *w, int base_value) { 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) ]; + if (v == 15) + return ff_reverse[get_bits(&w->gb, 8 - w->shift)]; else - return base_value + ((v - 7)<shift); + return base_value + ((v - 7) << w->shift); } static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; WNV1Context * const l = avctx->priv_data; - AVFrame * const p = &l->pic; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + AVFrame * const p = &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){ + if (!rbuf) { av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n"); return -1; } - if(p->data[0]) + if (p->data[0]) avctx->release_buffer(avctx, p); p->reference = 0; @@ -88,9 +88,9 @@ static int decode_frame(AVCodecContext *avctx, } p->key_frame = 1; - for(i=8; igb, rbuf+8, (buf_size-8)*8); + for (i = 8; i < buf_size; i++) + 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; @@ -131,14 +131,15 @@ static int decode_frame(AVCodecContext *avctx, 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; static VLC_TYPE code_table[1 << CODE_VLC_BITS][2]; - l->avctx = avctx; + l->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_YUV422P; - code_vlc.table = code_table; + 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, @@ -147,7 +148,8 @@ static av_cold int decode_init(AVCodecContext *avctx){ return 0; } -static av_cold int decode_end(AVCodecContext *avctx){ +static av_cold int decode_end(AVCodecContext *avctx) +{ WNV1Context * const l = avctx->priv_data; AVFrame *pic = &l->pic; -- 2.11.4.GIT