diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-30 21:33:24 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-05 19:54:09 +0200 |
| commit | ce7dbd0481f990e249c2a05f179228489d3062cf (patch) | |
| tree | c5f04e58129705430e1d97a5842131b72e250083 /libavcodec/flicvideo.c | |
| parent | fb59a42ef977dd91085a602f10c9c82f88d072e5 (diff) | |
avcodec/codec_internal: Make FFCodec.decode use AVFrame*
This increases type-safety by avoiding conversions from/through void*.
It also avoids the boilerplate "AVFrame *frame = data;" line
for non-subtitle decoders.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/flicvideo.c')
| -rw-r--r-- | libavcodec/flicvideo.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 2169202f4f..79e50aa71d 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -149,7 +149,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) } static int flic_decode_frame_8BPP(AVCodecContext *avctx, - void *data, int *got_frame, + AVFrame *rframe, int *got_frame, const uint8_t *buf, int buf_size) { FlicDecodeContext *s = avctx->priv_data; @@ -479,7 +479,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, s->new_palette = 0; } - if ((ret = av_frame_ref(data, s->frame)) < 0) + if ((ret = av_frame_ref(rframe, s->frame)) < 0) return ret; *got_frame = 1; @@ -488,7 +488,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, } static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, - void *data, int *got_frame, + AVFrame *rframe, int *got_frame, const uint8_t *buf, int buf_size) { /* Note, the only difference between the 15Bpp and 16Bpp */ @@ -781,7 +781,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Processed FLI chunk where chunk size = %d " \ "and final chunk ptr = %d\n", buf_size, bytestream2_tell(&g2)); - if ((ret = av_frame_ref(data, s->frame)) < 0) + if ((ret = av_frame_ref(rframe, s->frame)) < 0) return ret; *got_frame = 1; @@ -790,7 +790,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, } static int flic_decode_frame_24BPP(AVCodecContext *avctx, - void *data, int *got_frame, + AVFrame *rframe, int *got_frame, const uint8_t *buf, int buf_size) { FlicDecodeContext *s = avctx->priv_data; @@ -1061,7 +1061,7 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Processed FLI chunk where chunk size = %d " \ "and final chunk ptr = %d\n", buf_size, bytestream2_tell(&g2)); - if ((ret = av_frame_ref(data, s->frame)) < 0) + if ((ret = av_frame_ref(rframe, s->frame)) < 0) return ret; *got_frame = 1; @@ -1069,21 +1069,20 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx, return buf_size; } -static int flic_decode_frame(AVCodecContext *avctx, - void *data, int *got_frame, - AVPacket *avpkt) +static int flic_decode_frame(AVCodecContext *avctx, AVFrame *frame, + int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { - return flic_decode_frame_8BPP(avctx, data, got_frame, + return flic_decode_frame_8BPP(avctx, frame, got_frame, buf, buf_size); } else if ((avctx->pix_fmt == AV_PIX_FMT_RGB555) || (avctx->pix_fmt == AV_PIX_FMT_RGB565)) { - return flic_decode_frame_15_16BPP(avctx, data, got_frame, + return flic_decode_frame_15_16BPP(avctx, frame, got_frame, buf, buf_size); } else if (avctx->pix_fmt == AV_PIX_FMT_BGR24) { - return flic_decode_frame_24BPP(avctx, data, got_frame, + return flic_decode_frame_24BPP(avctx, frame, got_frame, buf, buf_size); } |