Commit 6b60a4c9 authored by Diego Biurrun's avatar Diego Biurrun

cljr: K&R cosmetics

parent 1c45c64c
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "get_bits.h" #include "get_bits.h"
#include "put_bits.h" #include "put_bits.h"
typedef struct CLJRContext{ typedef struct CLJRContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame picture; AVFrame picture;
} CLJRContext; } CLJRContext;
...@@ -56,34 +56,35 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -56,34 +56,35 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame * const p = &a->picture; AVFrame * const p = &a->picture;
int x, y; int x, y;
if(p->data[0]) if (p->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
if(buf_size/avctx->height < avctx->width) { if (buf_size / avctx->height < avctx->width) {
av_log(avctx, AV_LOG_ERROR, "Resolution larger than buffer size. Invalid header?\n"); av_log(avctx, AV_LOG_ERROR,
"Resolution larger than buffer size. Invalid header?\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
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;
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
for(y=0; y<avctx->height; y++){ for (y = 0; y < avctx->height; y++) {
uint8_t *luma= &a->picture.data[0][ y*a->picture.linesize[0] ]; uint8_t *luma = &a->picture.data[0][y * a->picture.linesize[0]];
uint8_t *cb= &a->picture.data[1][ y*a->picture.linesize[1] ]; uint8_t *cb = &a->picture.data[1][y * a->picture.linesize[1]];
uint8_t *cr= &a->picture.data[2][ y*a->picture.linesize[2] ]; uint8_t *cr = &a->picture.data[2][y * a->picture.linesize[2]];
for(x=0; x<avctx->width; x+=4){ for (x = 0; x < avctx->width; x += 4) {
luma[3] = get_bits(&gb, 5) << 3; luma[3] = get_bits(&gb, 5) << 3;
luma[2] = get_bits(&gb, 5) << 3; luma[2] = get_bits(&gb, 5) << 3;
luma[1] = get_bits(&gb, 5) << 3; luma[1] = get_bits(&gb, 5) << 3;
luma[0] = get_bits(&gb, 5) << 3; luma[0] = get_bits(&gb, 5) << 3;
luma+= 4; luma += 4;
*(cb++) = get_bits(&gb, 6) << 2; *(cb++) = get_bits(&gb, 6) << 2;
*(cr++) = get_bits(&gb, 6) << 2; *(cr++) = get_bits(&gb, 6) << 2;
} }
...@@ -124,13 +125,15 @@ AVCodec ff_cljr_decoder = { ...@@ -124,13 +125,15 @@ AVCodec ff_cljr_decoder = {
#endif #endif
#if CONFIG_CLJR_ENCODER #if CONFIG_CLJR_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)
{
PutBitContext pb; PutBitContext pb;
AVFrame *p = data; AVFrame *p = data;
int x, y; int x, y;
p->pict_type= AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame= 1; p->key_frame = 1;
init_put_bits(&pb, buf, buf_size / 8); init_put_bits(&pb, buf, buf_size / 8);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment