From db1e403cfbfdba00826c458fa80c4cd83d5499ec Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 8 Apr 2012 13:05:17 +0200 Subject: vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments --- libavcodec/vcr1.c | 144 +++++++++++++++++++++++++++--------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) (limited to 'libavcodec/vcr1.c') diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 23b06479ae..681150d80e 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -21,92 +21,88 @@ /** * @file - * ati vcr1 codec. + * ATI VCR1 codec */ #include "avcodec.h" #include "dsputil.h" -//#undef NDEBUG -//#include - /* Disable the encoder. */ #undef CONFIG_VCR1_ENCODER #define CONFIG_VCR1_ENCODER 0 -typedef struct VCR1Context{ +typedef struct VCR1Context { AVCodecContext *avctx; AVFrame picture; int delta[16]; int offset[4]; } VCR1Context; -static int decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - AVPacket *avpkt) +static int decode_frame(AVCodecContext *avctx, void *data, + int *data_size, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; - VCR1Context * const a = avctx->priv_data; - AVFrame *picture = data; - AVFrame * const p = &a->picture; - const uint8_t *bytestream= buf; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + VCR1Context *const a = avctx->priv_data; + AVFrame *picture = data; + AVFrame *const p = &a->picture; + const uint8_t *bytestream = buf; int i, x, y; - if(p->data[0]) + if (p->data[0]) avctx->release_buffer(avctx, p); - p->reference= 0; - if(avctx->get_buffer(avctx, p) < 0){ + p->reference = 0; + if (avctx->get_buffer(avctx, p) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } - p->pict_type= AV_PICTURE_TYPE_I; - p->key_frame= 1; + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; - for(i=0; i<16; i++){ - a->delta[i]= *(bytestream++); + for (i = 0; i < 16; i++) { + a->delta[i] = *bytestream++; bytestream++; } - for(y=0; yheight; y++){ + for (y = 0; y < avctx->height; y++) { int offset; - uint8_t *luma= &a->picture.data[0][ y*a->picture.linesize[0] ]; + uint8_t *luma = &a->picture.data[0][y * a->picture.linesize[0]]; - if((y&3) == 0){ - uint8_t *cb= &a->picture.data[1][ (y>>2)*a->picture.linesize[1] ]; - uint8_t *cr= &a->picture.data[2][ (y>>2)*a->picture.linesize[2] ]; + if ((y & 3) == 0) { + uint8_t *cb = &a->picture.data[1][(y >> 2) * a->picture.linesize[1]]; + uint8_t *cr = &a->picture.data[2][(y >> 2) * a->picture.linesize[2]]; - for(i=0; i<4; i++) - a->offset[i]= *(bytestream++); + for (i = 0; i < 4; i++) + a->offset[i] = *bytestream++; - offset= a->offset[0] - a->delta[ bytestream[2]&0xF ]; - for(x=0; xwidth; x+=4){ - luma[0]=( offset += a->delta[ bytestream[2]&0xF ]); - luma[1]=( offset += a->delta[ bytestream[2]>>4 ]); - luma[2]=( offset += a->delta[ bytestream[0]&0xF ]); - luma[3]=( offset += a->delta[ bytestream[0]>>4 ]); - luma += 4; + offset = a->offset[0] - a->delta[bytestream[2] & 0xF]; + for (x = 0; x < avctx->width; x += 4) { + luma[0] = offset += a->delta[bytestream[2] & 0xF]; + luma[1] = offset += a->delta[bytestream[2] >> 4]; + luma[2] = offset += a->delta[bytestream[0] & 0xF]; + luma[3] = offset += a->delta[bytestream[0] >> 4]; + luma += 4; - *(cb++) = bytestream[3]; - *(cr++) = bytestream[1]; + *cb++ = bytestream[3]; + *cr++ = bytestream[1]; - bytestream+= 4; + bytestream += 4; } - }else{ - offset= a->offset[y&3] - a->delta[ bytestream[2]&0xF ]; - - for(x=0; xwidth; x+=8){ - luma[0]=( offset += a->delta[ bytestream[2]&0xF ]); - luma[1]=( offset += a->delta[ bytestream[2]>>4 ]); - luma[2]=( offset += a->delta[ bytestream[3]&0xF ]); - luma[3]=( offset += a->delta[ bytestream[3]>>4 ]); - luma[4]=( offset += a->delta[ bytestream[0]&0xF ]); - luma[5]=( offset += a->delta[ bytestream[0]>>4 ]); - luma[6]=( offset += a->delta[ bytestream[1]&0xF ]); - luma[7]=( offset += a->delta[ bytestream[1]>>4 ]); - luma += 8; - bytestream+= 4; + } else { + offset = a->offset[y & 3] - a->delta[bytestream[2] & 0xF]; + + for (x = 0; x < avctx->width; x += 8) { + luma[0] = offset += a->delta[bytestream[2] & 0xF]; + luma[1] = offset += a->delta[bytestream[2] >> 4]; + luma[2] = offset += a->delta[bytestream[3] & 0xF]; + luma[3] = offset += a->delta[bytestream[3] >> 4]; + luma[4] = offset += a->delta[bytestream[0] & 0xF]; + luma[5] = offset += a->delta[bytestream[0] >> 4]; + luma[6] = offset += a->delta[bytestream[1] & 0xF]; + luma[7] = offset += a->delta[bytestream[1] >> 4]; + luma += 8; + bytestream += 4; } } } @@ -118,43 +114,47 @@ static int decode_frame(AVCodecContext *avctx, } #if CONFIG_VCR1_ENCODER -static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ - VCR1Context * const a = avctx->priv_data; - AVFrame *pict = data; - AVFrame * const p = &a->picture; +static int encode_frame(AVCodecContext *avctx, unsigned char *buf, + int buf_size, void *data) +{ + VCR1Context *const a = avctx->priv_data; + AVFrame *pict = data; + AVFrame *const p = &a->picture; int size; - *p = *pict; - p->pict_type= AV_PICTURE_TYPE_I; - p->key_frame= 1; + *p = *pict; + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; avpriv_align_put_bits(&a->pb); - while(get_bit_count(&a->pb)&31) + while (get_bit_count(&a->pb) & 31) put_bits(&a->pb, 8, 0); - size= get_bit_count(&a->pb)/32; + size = get_bit_count(&a->pb) / 32; - return size*4; + return size * 4; } #endif -static av_cold void common_init(AVCodecContext *avctx){ - VCR1Context * const a = avctx->priv_data; +static av_cold void common_init(AVCodecContext *avctx) +{ + VCR1Context *const a = avctx->priv_data; avctx->coded_frame = &a->picture; - a->avctx= avctx; + a->avctx = avctx; } -static av_cold int decode_init(AVCodecContext *avctx){ - +static av_cold int decode_init(AVCodecContext *avctx) +{ common_init(avctx); - avctx->pix_fmt= PIX_FMT_YUV410P; + avctx->pix_fmt = PIX_FMT_YUV410P; return 0; } -static av_cold int decode_end(AVCodecContext *avctx){ +static av_cold int decode_end(AVCodecContext *avctx) +{ VCR1Context *s = avctx->priv_data; if (s->picture.data[0]) @@ -164,8 +164,8 @@ static av_cold int decode_end(AVCodecContext *avctx){ } #if CONFIG_VCR1_ENCODER -static av_cold int encode_init(AVCodecContext *avctx){ - +static av_cold int encode_init(AVCodecContext *avctx) +{ common_init(avctx); return 0; @@ -194,4 +194,4 @@ AVCodec ff_vcr1_encoder = { .encode = encode_frame, .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; -#endif +#endif /* CONFIG_VCR1_ENCODER */ -- cgit v1.2.3 From 51c4d870936976039807bbc881850cf6491fc89a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 9 Apr 2012 18:11:35 +0200 Subject: vcr1: group encoder code together to save #ifdefs --- libavcodec/vcr1.c | 90 ++++++++++++++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 47 deletions(-) (limited to 'libavcodec/vcr1.c') diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 681150d80e..a745e58300 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -27,10 +27,6 @@ #include "avcodec.h" #include "dsputil.h" -/* Disable the encoder. */ -#undef CONFIG_VCR1_ENCODER -#define CONFIG_VCR1_ENCODER 0 - typedef struct VCR1Context { AVCodecContext *avctx; AVFrame picture; @@ -38,6 +34,33 @@ typedef struct VCR1Context { int offset[4]; } VCR1Context; +static av_cold void common_init(AVCodecContext *avctx) +{ + VCR1Context *const a = avctx->priv_data; + + avctx->coded_frame = &a->picture; + a->avctx = avctx; +} + +static av_cold int decode_init(AVCodecContext *avctx) +{ + common_init(avctx); + + avctx->pix_fmt = PIX_FMT_YUV410P; + + return 0; +} + +static av_cold int decode_end(AVCodecContext *avctx) +{ + VCR1Context *s = avctx->priv_data; + + if (s->picture.data[0]) + avctx->release_buffer(avctx, &s->picture); + + return 0; +} + static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { @@ -113,6 +136,22 @@ static int decode_frame(AVCodecContext *avctx, void *data, return buf_size; } +AVCodec ff_vcr1_decoder = { + .name = "vcr1", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_VCR1, + .priv_data_size = sizeof(VCR1Context), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), +}; + +/* Disable the encoder. */ +#undef CONFIG_VCR1_ENCODER +#define CONFIG_VCR1_ENCODER 0 + #if CONFIG_VCR1_ENCODER static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) @@ -134,57 +173,14 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, return size * 4; } -#endif - -static av_cold void common_init(AVCodecContext *avctx) -{ - VCR1Context *const a = avctx->priv_data; - - avctx->coded_frame = &a->picture; - a->avctx = avctx; -} - -static av_cold int decode_init(AVCodecContext *avctx) -{ - common_init(avctx); - - avctx->pix_fmt = PIX_FMT_YUV410P; - - return 0; -} - -static av_cold int decode_end(AVCodecContext *avctx) -{ - VCR1Context *s = avctx->priv_data; - - if (s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); - - return 0; -} -#if CONFIG_VCR1_ENCODER static av_cold int encode_init(AVCodecContext *avctx) { common_init(avctx); return 0; } -#endif - -AVCodec ff_vcr1_decoder = { - .name = "vcr1", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_VCR1, - .priv_data_size = sizeof(VCR1Context), - .init = decode_init, - .close = decode_end, - .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), -}; -#if CONFIG_VCR1_ENCODER AVCodec ff_vcr1_encoder = { .name = "vcr1", .type = AVMEDIA_TYPE_VIDEO, -- cgit v1.2.3 From eeeefd500124a1ec3a7ca75d9c071c5517c3d153 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 12 Apr 2012 18:52:16 +0200 Subject: vcr1: drop pointless write-only AVCodecContext member from VCR1Context --- libavcodec/vcr1.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'libavcodec/vcr1.c') diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index a745e58300..e3e45cc6a5 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -28,7 +28,6 @@ #include "dsputil.h" typedef struct VCR1Context { - AVCodecContext *avctx; AVFrame picture; int delta[16]; int offset[4]; @@ -39,7 +38,6 @@ static av_cold void common_init(AVCodecContext *avctx) VCR1Context *const a = avctx->priv_data; avctx->coded_frame = &a->picture; - a->avctx = avctx; } static av_cold int decode_init(AVCodecContext *avctx) -- cgit v1.2.3 From 8ae19143277e8c740e1cdeb280cfdf4c47a3eb23 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 12 Apr 2012 18:55:25 +0200 Subject: vcr1enc: drop pointless empty encode_init() wrapper function --- libavcodec/vcr1.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libavcodec/vcr1.c') diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index e3e45cc6a5..7edd801b8f 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -172,19 +172,12 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, return size * 4; } -static av_cold int encode_init(AVCodecContext *avctx) -{ - common_init(avctx); - - return 0; -} - AVCodec ff_vcr1_encoder = { .name = "vcr1", .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_VCR1, .priv_data_size = sizeof(VCR1Context), - .init = encode_init, + .init = common_init, .encode = encode_frame, .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; -- cgit v1.2.3