generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'dwbuiten/master'

Browse Source 
* dwbuiten/master:
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-04 21:21:41 +02:00
commit f85746509c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
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,29 +44,28 @@ 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;
pic->pict_type = AV_PICTURE_TYPE_P; pic->pict_type = AV_PICTURE_TYPE_P;
} }
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) { if (avctx->get_buffer(avctx, pic) < 0) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n"); av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
zret = inflateReset(zstream); zstream->next_in = avpkt->data;
zstream->avail_in = avpkt->size;
if (zret != Z_OK) { dst = pic->data[0];
av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d\n", zret);
return AVERROR(EINVAL);
}
zstream->next_in = avpkt->data;
zstream->avail_in = avpkt->size;
dst = pic->data[0];
/** /**
* ZeroCodec has very simple interframe compression. If a value * ZeroCodec has very simple interframe compression. If a value
@ -75,11 +75,13 @@ 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) {
avctx->release_buffer(avctx, pic);
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 +139,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);