[FFmpeg-cvslog] vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments
Diego Biurrun
git at videolan.org
Thu May 10 23:33:13 CEST 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sun Apr 8 13:05:17 2012 +0200| [db1e403cfbfdba00826c458fa80c4cd83d5499ec] | committer: Diego Biurrun
vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db1e403cfbfdba00826c458fa80c4cd83d5499ec
---
libavcodec/vcr1.c | 144 ++++++++++++++++++++++++++--------------------------
1 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 23b0647..681150d 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 <assert.h>
-
/* 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; y<avctx->height; 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; 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;
+ 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; 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;
+ } 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 */
More information about the ffmpeg-cvslog
mailing list