From d6124d0d142a9246b3580a3eccb671d727b7e504 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Fri, 3 Aug 2012 21:41:24 -0400 Subject: [PATCH 1/2] zerocodec: Cosmetics Be consistent with error messages and code formatting. Signed-off-by: Derek Buitenhuis --- libavcodec/zerocodec.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index 6581706765..8d46bfdcf8 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -23,7 +23,7 @@ typedef struct { AVFrame previous_frame; z_stream zstream; - int size; + int size; } ZeroCodecContext; 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 *prev_pic = &zc->previous_frame; 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; pic->reference = 3; @@ -43,7 +44,7 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, pic->pict_type = AV_PICTURE_TYPE_I; } else { 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; } pic->key_frame = 0; @@ -56,16 +57,15 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, } zret = inflateReset(zstream); - if (zret != Z_OK) { - av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d\n", zret); - return AVERROR(EINVAL); + av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d.\n", zret); + return AVERROR_INVALIDDATA; } - zstream->next_in = avpkt->data; - zstream->avail_in = avpkt->size; + zstream->next_in = avpkt->data; + zstream->avail_in = avpkt->size; - dst = pic->data[0]; + dst = pic->data[0]; /** * ZeroCodec has very simple interframe compression. If a value @@ -75,11 +75,12 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, for (i = 0; i < avctx->height; i++) { zstream->next_out = dst; zstream->avail_out = avctx->width << 1; + zret = inflate(zstream, Z_SYNC_FLUSH); if (zret != Z_OK && zret != Z_STREAM_END) { av_log(avctx, AV_LOG_ERROR, - "Inflate failed with return code: %d\n", zret); - return AVERROR(EINVAL); + "Inflate failed with return code: %d.\n", zret); + return AVERROR_INVALIDDATA; } if (!(avpkt->flags & AV_PKT_FLAG_KEY)) @@ -137,14 +138,12 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx) zstream->opaque = Z_NULL; zret = inflateInit(zstream); - 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); } avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) { av_log(avctx, AV_LOG_ERROR, "Could not allocate frame buffer.\n"); zerocodec_decode_close(avctx); From fcf550c2cbc35c1c4d90f8d23bb3340ebc31ce46 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Fri, 3 Aug 2012 22:13:43 -0400 Subject: [PATCH 2/2] zerocodec: Fix memleak in decode_frame If there was a failure inflating, or reinitializing the zstream, the current frame's buffer would be lost. Signed-off-by: Derek Buitenhuis --- libavcodec/zerocodec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index 8d46bfdcf8..cfbd16f147 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -51,17 +51,17 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, pic->pict_type = AV_PICTURE_TYPE_P; } - if (avctx->get_buffer(avctx, pic) < 0) { - av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n"); - return AVERROR(ENOMEM); - } - zret = inflateReset(zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d.\n", zret); return AVERROR_INVALIDDATA; } + if (avctx->get_buffer(avctx, pic) < 0) { + av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n"); + return AVERROR(ENOMEM); + } + zstream->next_in = avpkt->data; zstream->avail_in = avpkt->size; @@ -78,6 +78,7 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, zret = inflate(zstream, Z_SYNC_FLUSH); if (zret != Z_OK && zret != Z_STREAM_END) { + avctx->release_buffer(avctx, pic); av_log(avctx, AV_LOG_ERROR, "Inflate failed with return code: %d.\n", zret); return AVERROR_INVALIDDATA;