typedef struct MSS1Context {
MSS12Context ctx;
- AVFrame pic;
+ AVFrame *pic;
SliceContext sc;
} MSS1Context;
init_get_bits(&gb, buf, buf_size * 8);
arith_init(&acoder, &gb);
- if ((ret = ff_reget_buffer(avctx, &ctx->pic)) < 0)
+ if ((ret = ff_reget_buffer(avctx, ctx->pic)) < 0)
return ret;
- c->pal_pic = ctx->pic.data[0] + ctx->pic.linesize[0] * (avctx->height - 1);
- c->pal_stride = -ctx->pic.linesize[0];
+ c->pal_pic = ctx->pic->data[0] + ctx->pic->linesize[0] * (avctx->height - 1);
+ c->pal_stride = -ctx->pic->linesize[0];
c->keyframe = !arith_get_bit(&acoder);
if (c->keyframe) {
c->corrupted = 0;
ff_mss12_slicecontext_reset(&ctx->sc);
pal_changed = decode_pal(c, &acoder);
- ctx->pic.key_frame = 1;
- ctx->pic.pict_type = AV_PICTURE_TYPE_I;
+ ctx->pic->key_frame = 1;
+ ctx->pic->pict_type = AV_PICTURE_TYPE_I;
} else {
if (c->corrupted)
return AVERROR_INVALIDDATA;
- ctx->pic.key_frame = 0;
- ctx->pic.pict_type = AV_PICTURE_TYPE_P;
+ ctx->pic->key_frame = 0;
+ ctx->pic->pict_type = AV_PICTURE_TYPE_P;
}
c->corrupted = ff_mss12_decode_rect(&ctx->sc, &acoder, 0, 0,
avctx->width, avctx->height);
if (c->corrupted)
return AVERROR_INVALIDDATA;
- memcpy(ctx->pic.data[1], c->pal, AVPALETTE_SIZE);
- ctx->pic.palette_has_changed = pal_changed;
+ memcpy(ctx->pic->data[1], c->pal, AVPALETTE_SIZE);
+ 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;
*got_frame = 1;
c->ctx.avctx = avctx;
- avcodec_get_frame_defaults(&c->pic);
+ c->pic = av_frame_alloc();
+ if (!c->pic)
+ return AVERROR(ENOMEM);
ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL);
{
MSS1Context * const ctx = avctx->priv_data;
- av_frame_unref(&ctx->pic);
+ av_frame_free(&ctx->pic);
ff_mss12_decode_end(&ctx->ctx);
return 0;
return buf_size;
}
+static av_cold int mss3_decode_end(AVCodecContext *avctx)
+{
+ MSS3Context * const c = avctx->priv_data;
+ int i;
+
+ av_frame_free(&c->pic);
+ for (i = 0; i < 3; i++)
+ av_freep(&c->dct_coder[i].prev_dc);
+
+ return 0;
+}
+
static av_cold int mss3_decode_init(AVCodecContext *avctx)
{
MSS3Context * const c = avctx->priv_data;
int i;
c->avctx = avctx;
- c->pic = av_frame_alloc();
- if (!c->pic)
- return AVERROR(ENOMEM);
if ((avctx->width & 0xF) || (avctx->height & 0xF)) {
av_log(avctx, AV_LOG_ERROR,
}
}
+ c->pic = av_frame_alloc();
+ if (!c->pic) {
+ mss3_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
init_coders(c);
return 0;
}
-static av_cold int mss3_decode_end(AVCodecContext *avctx)
-{
- MSS3Context * const c = avctx->priv_data;
- int i;
-
- av_frame_free(&c->pic);
- for (i = 0; i < 3; i++)
- av_freep(&c->dct_coder[i].prev_dc);
-
- return 0;
-}
-
AVCodec ff_msa1_decoder = {
.name = "msa1",
.long_name = NULL_IF_CONFIG_SMALL("MS ATC Screen"),
return buf_size;
}
-static av_cold int mss4_decode_init(AVCodecContext *avctx)
+static av_cold int mss4_decode_end(AVCodecContext *avctx)
{
MSS4Context * const c = avctx->priv_data;
int i;
- c->pic = av_frame_alloc();
- if (!c->pic)
- return AVERROR(ENOMEM);
+ av_frame_free(&c->pic);
+ for (i = 0; i < 3; i++)
+ av_freep(&c->prev_dc[i]);
+ mss4_free_vlcs(c);
+
+ return 0;
+}
+
+static av_cold int mss4_decode_init(AVCodecContext *avctx)
+{
+ MSS4Context * const c = avctx->priv_data;
+ int i;
if (mss4_init_vlcs(c)) {
av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n");
}
}
- avctx->pix_fmt = AV_PIX_FMT_YUV444P;
-
- return 0;
-}
-
-static av_cold int mss4_decode_end(AVCodecContext *avctx)
-{
- MSS4Context * const c = avctx->priv_data;
- int i;
-
- av_frame_free(&c->pic);
+ c->pic = av_frame_alloc();
+ if (!c->pic) {
+ mss4_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
- for (i = 0; i < 3; i++)
- av_freep(&c->prev_dc[i]);
- mss4_free_vlcs(c);
+ avctx->pix_fmt = AV_PIX_FMT_YUV444P;
return 0;
}