Commit d6124d0d authored by Derek Buitenhuis's avatar Derek Buitenhuis

zerocodec: Cosmetics

Be consistent with error messages and code formatting.
Signed-off-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parent 759901f8
...@@ -33,7 +33,8 @@ 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, ...@@ -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,10 +57,9 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, ...@@ -56,10 +57,9 @@ 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;
...@@ -75,11 +75,12 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, ...@@ -75,11 +75,12 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
for (i = 0; i < avctx->height; i++) { for (i = 0; i < avctx->height; i++) {
zstream->next_out = dst; zstream->next_out = dst;
zstream->avail_out = avctx->width << 1; zstream->avail_out = avctx->width << 1;
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))
...@@ -137,14 +138,12 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx) ...@@ -137,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);
......
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