diff options
Diffstat (limited to 'libavcodec/tmv.c')
| -rw-r--r-- | libavcodec/tmv.c | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index f8d7969d40..2e6a22badf 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -35,14 +35,10 @@ #include "cga_data.h" -typedef struct TMVContext { - AVFrame pic; -} TMVContext; - static int tmv_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - TMVContext *tmv = avctx->priv_data; + AVFrame *frame = data; const uint8_t *src = avpkt->data; uint8_t *dst; unsigned char_cols = avctx->width >> 3; @@ -50,10 +46,7 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data, unsigned x, y, fg, bg, c; int ret; - if (tmv->pic.data[0]) - avctx->release_buffer(avctx, &tmv->pic); - - if ((ret = ff_get_buffer(avctx, &tmv->pic)) < 0) { + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -65,45 +58,33 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - tmv->pic.pict_type = AV_PICTURE_TYPE_I; - tmv->pic.key_frame = 1; - dst = tmv->pic.data[0]; + frame->pict_type = AV_PICTURE_TYPE_I; + frame->key_frame = 1; + dst = frame->data[0]; - tmv->pic.palette_has_changed = 1; - memcpy(tmv->pic.data[1], ff_cga_palette, 16 * 4); - memset(tmv->pic.data[1] + 16 * 4, 0, AVPALETTE_SIZE - 16 * 4); + frame->palette_has_changed = 1; + memcpy(frame->data[1], ff_cga_palette, 16 * 4); + memset(frame->data[1] + 16 * 4, 0, AVPALETTE_SIZE - 16 * 4); for (y = 0; y < char_rows; y++) { for (x = 0; x < char_cols; x++) { c = *src++; bg = *src >> 4; fg = *src++ & 0xF; - ff_draw_pc_font(dst + x * 8, tmv->pic.linesize[0], + ff_draw_pc_font(dst + x * 8, frame->linesize[0], avpriv_cga_font, 8, c, fg, bg); } - dst += tmv->pic.linesize[0] * 8; + dst += frame->linesize[0] * 8; } *got_frame = 1; - *(AVFrame *)data = tmv->pic; + return avpkt->size; } static av_cold int tmv_decode_init(AVCodecContext *avctx) { - TMVContext *tmv = avctx->priv_data; avctx->pix_fmt = AV_PIX_FMT_PAL8; - avcodec_get_frame_defaults(&tmv->pic); - return 0; -} - -static av_cold int tmv_decode_close(AVCodecContext *avctx) -{ - TMVContext *tmv = avctx->priv_data; - - if (tmv->pic.data[0]) - avctx->release_buffer(avctx, &tmv->pic); - return 0; } @@ -111,9 +92,7 @@ AVCodec ff_tmv_decoder = { .name = "tmv", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TMV, - .priv_data_size = sizeof(TMVContext), .init = tmv_decode_init, - .close = tmv_decode_close, .decode = tmv_decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("8088flex TMV"), |