RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zerocodec: fix direct rendering. 

Set picture type before calling get_buffer.
This allows the DR application to make better decisions.
It also fixes a resource leak in case of missing reference frames
since it would call get_buffer but never release_buffer.
Also use FFSWAP to ensure that the AVFrame is properly initialized
in the next get_buffer (in particular that data[0] is NULL).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-07-21 13:22:04 +02:00
parent a36f19e942
commit 313d1981ad
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/zerocodec.c
View File

@ -33,11 +33,23 @@ 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, *dst; uint8_t *prev = prev_pic->data[0], *dst;
int i, j, zret; int i, j, zret;
pic->reference = 3; pic->reference = 3;
if (avpkt->flags & AV_PKT_FLAG_KEY) {
pic->key_frame = 1;
pic->pict_type = AV_PICTURE_TYPE_I;
} else {
if (!prev) {
av_log(avctx, AV_LOG_ERROR, "Missing reference frame!\n");
return AVERROR_INVALIDDATA;
}
pic->key_frame = 0;
pic->pict_type = AV_PICTURE_TYPE_P;
}
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);
@ -53,7 +65,6 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
zstream->next_in = avpkt->data; zstream->next_in = avpkt->data;
zstream->avail_in = avpkt->size; zstream->avail_in = avpkt->size;
prev = prev_pic->data[0];
dst = pic->data[0]; dst = pic->data[0];
/** /**
@ -61,18 +72,6 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
* is the same as the previous frame, set it to 0. * is the same as the previous frame, set it to 0.
*/ */
if (avpkt->flags & AV_PKT_FLAG_KEY) {
pic->key_frame = 1;
pic->pict_type = AV_PICTURE_TYPE_I;
} else {
if (!prev) {
av_log(avctx, AV_LOG_ERROR, "Missing reference frame!\n");
return AVERROR_INVALIDDATA;
}
pic->key_frame = 0;
pic->pict_type = AV_PICTURE_TYPE_P;
}
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;
@ -95,12 +94,13 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
if (prev_pic->data[0]) if (prev_pic->data[0])
avctx->release_buffer(avctx, prev_pic); avctx->release_buffer(avctx, prev_pic);
/* Store the previouse frame for use later */
*prev_pic = *pic;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame *)data = *pic; *(AVFrame *)data = *pic;
/* Store the previous frame for use later.
* FFSWAP ensures that e.g. pic->data is NULLed. */
FFSWAP(AVFrame, *pic, *prev_pic);
return avpkt->size; return avpkt->size;
} }