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

mss1: use the AVFrame API properly.

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

29
libavcodec/mss1.c
View File

@ -30,7 +30,7 @@
typedef struct MSS1Context { typedef struct MSS1Context {
MSS12Context ctx; MSS12Context ctx;
AVFrame pic; AVFrame *pic;
SliceContext sc; SliceContext sc;
} MSS1Context; } MSS1Context;
@ -151,34 +151,34 @@ static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
arith_init(&acoder, &gb); arith_init(&acoder, &gb);
if ((ret = ff_reget_buffer(avctx, &ctx->pic)) < 0) { if ((ret = ff_reget_buffer(avctx, ctx->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;
} }
c->pal_pic = ctx->pic.data[0] + ctx->pic.linesize[0] * (avctx->height - 1); c->pal_pic = ctx->pic->data[0] + ctx->pic->linesize[0] * (avctx->height - 1);
c->pal_stride = -ctx->pic.linesize[0]; c->pal_stride = -ctx->pic->linesize[0];
c->keyframe = !arith_get_bit(&acoder); c->keyframe = !arith_get_bit(&acoder);
if (c->keyframe) { if (c->keyframe) {
c->corrupted = 0; c->corrupted = 0;
ff_mss12_slicecontext_reset(&ctx->sc); ff_mss12_slicecontext_reset(&ctx->sc);
pal_changed = decode_pal(c, &acoder); pal_changed = decode_pal(c, &acoder);
ctx->pic.key_frame = 1; ctx->pic->key_frame = 1;
ctx->pic.pict_type = AV_PICTURE_TYPE_I; ctx->pic->pict_type = AV_PICTURE_TYPE_I;
} else { } else {
if (c->corrupted) if (c->corrupted)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ctx->pic.key_frame = 0; ctx->pic->key_frame = 0;
ctx->pic.pict_type = AV_PICTURE_TYPE_P; ctx->pic->pict_type = AV_PICTURE_TYPE_P;
} }
c->corrupted = ff_mss12_decode_rect(&ctx->sc, &acoder, 0, 0, c->corrupted = ff_mss12_decode_rect(&ctx->sc, &acoder, 0, 0,
avctx->width, avctx->height); avctx->width, avctx->height);
if (c->corrupted) if (c->corrupted)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
memcpy(ctx->pic.data[1], c->pal, AVPALETTE_SIZE); memcpy(ctx->pic->data[1], c->pal, AVPALETTE_SIZE);
ctx->pic.palette_has_changed = pal_changed; ctx->pic->palette_has_changed = pal_changed;
if ((ret = av_frame_ref(data, &ctx->pic)) < 0) if ((ret = av_frame_ref(data, ctx->pic)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;
@ -193,7 +193,10 @@ static av_cold int mss1_decode_init(AVCodecContext *avctx)
int ret; int ret;
c->ctx.avctx = avctx; c->ctx.avctx = avctx;
avctx->coded_frame = &c->pic;
c->pic = av_frame_alloc();
if (!c->pic)
return AVERROR(ENOMEM);
ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL); ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL);
@ -206,7 +209,7 @@ static av_cold int mss1_decode_end(AVCodecContext *avctx)
{ {
MSS1Context * const ctx = avctx->priv_data; MSS1Context * const ctx = avctx->priv_data;
av_frame_unref(&ctx->pic); av_frame_free(&ctx->pic);
ff_mss12_decode_end(&ctx->ctx); ff_mss12_decode_end(&ctx->ctx);
return 0; return 0;