generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments

Browse Source
This commit is contained in:
Diego Biurrun 2012-04-08 13:05:17 +02:00
parent 59cbc4eee2
commit db1e403cfb
1 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
libavcodec/vcr1.c
View File

@ -21,15 +21,12 @@
/** /**
* @file * @file
* ati vcr1 codec. * ATI VCR1 codec
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
//#undef NDEBUG
//#include <assert.h>
/* Disable the encoder. */ /* Disable the encoder. */
#undef CONFIG_VCR1_ENCODER #undef CONFIG_VCR1_ENCODER
#define CONFIG_VCR1_ENCODER 0 #define CONFIG_VCR1_ENCODER 0
@ -41,9 +38,8 @@ typedef struct VCR1Context{
int offset[4]; int offset[4];
} VCR1Context; } VCR1Context;
static int decode_frame(AVCodecContext *avctx, static int decode_frame(AVCodecContext *avctx, void *data,
void *data, int *data_size, int *data_size, AVPacket *avpkt)
AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
@ -65,7 +61,7 @@ static int decode_frame(AVCodecContext *avctx,
p->key_frame = 1; p->key_frame = 1;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
a->delta[i]= *(bytestream++); a->delta[i] = *bytestream++;
bytestream++; bytestream++;
} }
@ -78,18 +74,18 @@ static int decode_frame(AVCodecContext *avctx,
uint8_t *cr = &a->picture.data[2][(y >> 2) * a->picture.linesize[2]]; uint8_t *cr = &a->picture.data[2][(y >> 2) * a->picture.linesize[2]];
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
a->offset[i]= *(bytestream++); a->offset[i] = *bytestream++;
offset = a->offset[0] - a->delta[bytestream[2] & 0xF]; offset = a->offset[0] - a->delta[bytestream[2] & 0xF];
for (x = 0; x < avctx->width; x += 4) { for (x = 0; x < avctx->width; x += 4) {
luma[0]=( offset += a->delta[ bytestream[2]&0xF ]); luma[0] = offset += a->delta[bytestream[2] & 0xF];
luma[1]=( offset += a->delta[ bytestream[2]>>4 ]); luma[1] = offset += a->delta[bytestream[2] >> 4];
luma[2]=( offset += a->delta[ bytestream[0]&0xF ]); luma[2] = offset += a->delta[bytestream[0] & 0xF];
luma[3]=( offset += a->delta[ bytestream[0]>>4 ]); luma[3] = offset += a->delta[bytestream[0] >> 4];
luma += 4; luma += 4;
*(cb++) = bytestream[3]; *cb++ = bytestream[3];
*(cr++) = bytestream[1]; *cr++ = bytestream[1];
bytestream += 4; bytestream += 4;
} }
@ -97,14 +93,14 @@ static int decode_frame(AVCodecContext *avctx,
offset = a->offset[y & 3] - a->delta[bytestream[2] & 0xF]; offset = a->offset[y & 3] - a->delta[bytestream[2] & 0xF];
for (x = 0; x < avctx->width; x += 8) { for (x = 0; x < avctx->width; x += 8) {
luma[0]=( offset += a->delta[ bytestream[2]&0xF ]); luma[0] = offset += a->delta[bytestream[2] & 0xF];
luma[1]=( offset += a->delta[ bytestream[2]>>4 ]); luma[1] = offset += a->delta[bytestream[2] >> 4];
luma[2]=( offset += a->delta[ bytestream[3]&0xF ]); luma[2] = offset += a->delta[bytestream[3] & 0xF];
luma[3]=( offset += a->delta[ bytestream[3]>>4 ]); luma[3] = offset += a->delta[bytestream[3] >> 4];
luma[4]=( offset += a->delta[ bytestream[0]&0xF ]); luma[4] = offset += a->delta[bytestream[0] & 0xF];
luma[5]=( offset += a->delta[ bytestream[0]>>4 ]); luma[5] = offset += a->delta[bytestream[0] >> 4];
luma[6]=( offset += a->delta[ bytestream[1]&0xF ]); luma[6] = offset += a->delta[bytestream[1] & 0xF];
luma[7]=( offset += a->delta[ bytestream[1]>>4 ]); luma[7] = offset += a->delta[bytestream[1] >> 4];
luma += 8; luma += 8;
bytestream += 4; bytestream += 4;
} }
@ -118,7 +114,9 @@ static int decode_frame(AVCodecContext *avctx,
} }
#if CONFIG_VCR1_ENCODER #if CONFIG_VCR1_ENCODER
static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
int buf_size, void *data)
{
VCR1Context *const a = avctx->priv_data; VCR1Context *const a = avctx->priv_data;
AVFrame *pict = data; AVFrame *pict = data;
AVFrame *const p = &a->picture; AVFrame *const p = &a->picture;
@ -138,15 +136,16 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
} }
#endif #endif
static av_cold void common_init(AVCodecContext *avctx){ static av_cold void common_init(AVCodecContext *avctx)
{
VCR1Context *const a = avctx->priv_data; VCR1Context *const a = avctx->priv_data;
avctx->coded_frame = &a->picture; 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); common_init(avctx);
avctx->pix_fmt = PIX_FMT_YUV410P; avctx->pix_fmt = PIX_FMT_YUV410P;
@ -154,7 +153,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)
{
VCR1Context *s = avctx->priv_data; VCR1Context *s = avctx->priv_data;
if (s->picture.data[0]) if (s->picture.data[0])
@ -164,8 +164,8 @@ static av_cold int decode_end(AVCodecContext *avctx){
} }
#if CONFIG_VCR1_ENCODER #if CONFIG_VCR1_ENCODER
static av_cold int encode_init(AVCodecContext *avctx){ static av_cold int encode_init(AVCodecContext *avctx)
{
common_init(avctx); common_init(avctx);
return 0; return 0;
@ -194,4 +194,4 @@ AVCodec ff_vcr1_encoder = {
.encode = encode_frame, .encode = encode_frame,
.long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
}; };
#endif #endif /* CONFIG_VCR1_ENCODER */