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

mss2: use the AVFrame API properly.

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-09 10:14:46 +01:00
parent acaffdca21
commit e9198f61db
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/mss2.c
View File

@ -34,7 +34,7 @@
typedef struct MSS2Context { typedef struct MSS2Context {
VC1Context v; VC1Context v;
int split_position; int split_position;
AVFrame last_pic; AVFrame *last_pic;
MSS12Context c; MSS12Context c;
MSS2DSPContext dsp; MSS2DSPContext dsp;
SliceContext sc[2]; SliceContext sc[2];
@ -523,8 +523,8 @@ static int mss2_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
avctx->pix_fmt = is_555 ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_RGB24; avctx->pix_fmt = is_555 ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_RGB24;
if (ctx->last_pic.format != avctx->pix_fmt) if (ctx->last_pic->format != avctx->pix_fmt)
av_frame_unref(&ctx->last_pic); av_frame_unref(ctx->last_pic);
if (has_wmv9) { if (has_wmv9) {
bytestream2_init(&gB, buf, buf_size + ARITH2_PADDING); bytestream2_init(&gB, buf, buf_size + ARITH2_PADDING);
@ -603,20 +603,20 @@ static int mss2_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return ret; return ret;
} }
if (ctx->last_pic.data[0]) { if (ctx->last_pic->data[0]) {
av_assert0(frame->linesize[0] == ctx->last_pic.linesize[0]); av_assert0(frame->linesize[0] == ctx->last_pic->linesize[0]);
c->last_rgb_pic = ctx->last_pic.data[0] + c->last_rgb_pic = ctx->last_pic->data[0] +
ctx->last_pic.linesize[0] * (avctx->height - 1); ctx->last_pic->linesize[0] * (avctx->height - 1);
} else { } else {
av_log(avctx, AV_LOG_ERROR, "Missing keyframe\n"); av_log(avctx, AV_LOG_ERROR, "Missing keyframe\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} else { } else {
if ((ret = ff_reget_buffer(avctx, &ctx->last_pic)) < 0) { if ((ret = ff_reget_buffer(avctx, ctx->last_pic)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return ret; return ret;
} }
if ((ret = av_frame_ref(frame, &ctx->last_pic)) < 0) if ((ret = av_frame_ref(frame, ctx->last_pic)) < 0)
return ret; return ret;
c->last_rgb_pic = NULL; c->last_rgb_pic = NULL;
@ -730,8 +730,8 @@ static int mss2_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
av_log(avctx, AV_LOG_WARNING, "buffer not fully consumed\n"); av_log(avctx, AV_LOG_WARNING, "buffer not fully consumed\n");
if (c->mvX < 0 || c->mvY < 0) { if (c->mvX < 0 || c->mvY < 0) {
av_frame_unref(&ctx->last_pic); av_frame_unref(ctx->last_pic);
ret = av_frame_ref(&ctx->last_pic, frame); ret = av_frame_ref(ctx->last_pic, frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -806,7 +806,7 @@ static av_cold int mss2_decode_end(AVCodecContext *avctx)
{ {
MSS2Context *const ctx = avctx->priv_data; MSS2Context *const ctx = avctx->priv_data;
av_frame_unref(&ctx->last_pic); av_frame_free(&ctx->last_pic);
ff_mss12_decode_end(&ctx->c); ff_mss12_decode_end(&ctx->c);
av_freep(&ctx->c.pal_pic); av_freep(&ctx->c.pal_pic);
@ -840,6 +840,12 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555 avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555
: AV_PIX_FMT_RGB24; : AV_PIX_FMT_RGB24;
ctx->last_pic = av_frame_alloc();
if (!ctx->last_pic) {
mss2_decode_end(avctx);
return AVERROR(ENOMEM);
}
return 0; return 0;
} }