virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

zerocodec: Cosmetics

Browse Source 
Be consistent with error messages and code formatting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2012-08-03 21:41:24 -04:00
parent 8821ae649e
commit 29facc1e91
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/zerocodec.c
View File

@ -23,7 +23,7 @@
typedef struct { typedef struct {
AVFrame previous_frame; AVFrame previous_frame;
z_stream zstream; z_stream zstream;
int size; int size;
} ZeroCodecContext; } ZeroCodecContext;
static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
@ -33,7 +33,8 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
AVFrame *pic = avctx->coded_frame; AVFrame *pic = avctx->coded_frame;
AVFrame *prev_pic = &zc->previous_frame; AVFrame *prev_pic = &zc->previous_frame;
z_stream *zstream = &zc->zstream; z_stream *zstream = &zc->zstream;
uint8_t *prev = prev_pic->data[0], *dst; uint8_t *prev = prev_pic->data[0];
uint8_t *dst;
int i, j, zret; int i, j, zret;
pic->reference = 3; pic->reference = 3;
@ -43,7 +44,7 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
pic->pict_type = AV_PICTURE_TYPE_I; pic->pict_type = AV_PICTURE_TYPE_I;
} else { } else {
if (!prev) { if (!prev) {
av_log(avctx, AV_LOG_ERROR, "Missing reference frame!\n"); av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
pic->key_frame = 0; pic->key_frame = 0;
@ -56,16 +57,15 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
} }
zret = inflateReset(zstream); zret = inflateReset(zstream);
if (zret != Z_OK) { if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d\n", zret); av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d.\n", zret);
return AVERROR(EINVAL); return AVERROR_INVALIDDATA;
} }
zstream->next_in = avpkt->data; zstream->next_in = avpkt->data;
zstream->avail_in = avpkt->size; zstream->avail_in = avpkt->size;
dst = pic->data[0]; dst = pic->data[0];
/** /**
* ZeroCodec has very simple interframe compression. If a value * ZeroCodec has very simple interframe compression. If a value
@ -79,8 +79,8 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
zret = inflate(zstream, Z_SYNC_FLUSH); zret = inflate(zstream, Z_SYNC_FLUSH);
if (zret != Z_OK && zret != Z_STREAM_END) { if (zret != Z_OK && zret != Z_STREAM_END) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Inflate failed with return code: %d\n", zret); "Inflate failed with return code: %d.\n", zret);
return AVERROR(EINVAL); return AVERROR_INVALIDDATA;
} }
if (!(avpkt->flags & AV_PKT_FLAG_KEY)) if (!(avpkt->flags & AV_PKT_FLAG_KEY))
@ -138,14 +138,12 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx)
zstream->opaque = Z_NULL; zstream->opaque = Z_NULL;
zret = inflateInit(zstream); zret = inflateInit(zstream);
if (zret != Z_OK) { if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Could not initialize inflate: %d\n", zret); av_log(avctx, AV_LOG_ERROR, "Could not initialize inflate: %d.\n", zret);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
avctx->coded_frame = avcodec_alloc_frame(); avctx->coded_frame = avcodec_alloc_frame();
if (!avctx->coded_frame) { if (!avctx->coded_frame) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate frame buffer.\n"); av_log(avctx, AV_LOG_ERROR, "Could not allocate frame buffer.\n");
zerocodec_decode_close(avctx); zerocodec_decode_close(avctx);