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

142
libavcodec/vcr1.c
View File

@ -21,92 +21,88 @@
/** /**
* @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
typedef struct VCR1Context{ typedef struct VCR1Context {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame picture; AVFrame picture;
int delta[16]; int delta[16];
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;
VCR1Context * const a = avctx->priv_data; VCR1Context *const a = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;
AVFrame * const p = &a->picture; AVFrame *const p = &a->picture;
const uint8_t *bytestream= buf; const uint8_t *bytestream = buf;
int i, x, y; int i, x, y;
if(p->data[0]) if (p->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
p->reference= 0; p->reference = 0;
if(avctx->get_buffer(avctx, p) < 0){ if (avctx->get_buffer(avctx, p) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
p->pict_type= AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;
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++;
} }
for(y=0; y<avctx->height; y++){ for (y = 0; y < avctx->height; y++) {
int offset; 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){ if ((y & 3) == 0) {
uint8_t *cb= &a->picture.data[1][ (y>>2)*a->picture.linesize[1] ]; 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] ]; 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;
} }
}else{ } else {
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,43 +114,47 @@ 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,
VCR1Context * const a = avctx->priv_data; int buf_size, void *data)
AVFrame *pict = data; {
AVFrame * const p = &a->picture; VCR1Context *const a = avctx->priv_data;
AVFrame *pict = data;
AVFrame *const p = &a->picture;
int size; int size;
*p = *pict; *p = *pict;
p->pict_type= AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame= 1; p->key_frame = 1;
avpriv_align_put_bits(&a->pb); 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); 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 #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;
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 */