From 71c378984b0bd5470f67c424a79a4750f84d2d3e Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 21 Aug 2013 19:27:31 +0000 Subject: qtrle: make code independent of sizeof(AVFrame) Signed-off-by: Paul B Mahol --- libavcodec/qtrle.c | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'libavcodec/qtrle.c') diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index da411f691d..a22d776660 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -41,7 +41,7 @@ typedef struct QtrleContext { AVCodecContext *avctx; - AVFrame frame; + AVFrame *frame; GetByteContext g; uint32_t pal[256]; @@ -58,10 +58,10 @@ static void qtrle_decode_1bpp(QtrleContext *s, int row_ptr, int lines_to_change) { int rle_code; int pixel_ptr; - int row_inc = s->frame.linesize[0]; + int row_inc = s->frame->linesize[0]; uint8_t pi0, pi1; /* 2 8-pixel values */ - uint8_t *rgb = s->frame.data[0]; - int pixel_limit = s->frame.linesize[0] * s->avctx->height; + uint8_t *rgb = s->frame->data[0]; + int pixel_limit = s->frame->linesize[0] * s->avctx->height; int skip; /* skip & 0x80 appears to mean 'start a new line', which can be interpreted * as 'go to next line' during the decoding of a frame but is 'go to first @@ -121,10 +121,10 @@ static inline void qtrle_decode_2n4bpp(QtrleContext *s, int row_ptr, { int rle_code, i; int pixel_ptr; - int row_inc = s->frame.linesize[0]; + int row_inc = s->frame->linesize[0]; uint8_t pi[16]; /* 16 palette indices */ - uint8_t *rgb = s->frame.data[0]; - int pixel_limit = s->frame.linesize[0] * s->avctx->height; + uint8_t *rgb = s->frame->data[0]; + int pixel_limit = s->frame->linesize[0] * s->avctx->height; int num_pixels = (bpp == 4) ? 8 : 16; while (lines_to_change--) { @@ -177,10 +177,10 @@ static void qtrle_decode_8bpp(QtrleContext *s, int row_ptr, int lines_to_change) { int rle_code; int pixel_ptr; - int row_inc = s->frame.linesize[0]; + int row_inc = s->frame->linesize[0]; uint8_t pi1, pi2, pi3, pi4; /* 4 palette indexes */ - uint8_t *rgb = s->frame.data[0]; - int pixel_limit = s->frame.linesize[0] * s->avctx->height; + uint8_t *rgb = s->frame->data[0]; + int pixel_limit = s->frame->linesize[0] * s->avctx->height; while (lines_to_change--) { pixel_ptr = row_ptr + (4 * (bytestream2_get_byte(&s->g) - 1)); @@ -226,10 +226,10 @@ static void qtrle_decode_16bpp(QtrleContext *s, int row_ptr, int lines_to_change { int rle_code; int pixel_ptr; - int row_inc = s->frame.linesize[0]; + int row_inc = s->frame->linesize[0]; uint16_t rgb16; - uint8_t *rgb = s->frame.data[0]; - int pixel_limit = s->frame.linesize[0] * s->avctx->height; + uint8_t *rgb = s->frame->data[0]; + int pixel_limit = s->frame->linesize[0] * s->avctx->height; while (lines_to_change--) { pixel_ptr = row_ptr + (bytestream2_get_byte(&s->g) - 1) * 2; @@ -270,10 +270,10 @@ static void qtrle_decode_24bpp(QtrleContext *s, int row_ptr, int lines_to_change { int rle_code; int pixel_ptr; - int row_inc = s->frame.linesize[0]; + int row_inc = s->frame->linesize[0]; uint8_t r, g, b; - uint8_t *rgb = s->frame.data[0]; - int pixel_limit = s->frame.linesize[0] * s->avctx->height; + uint8_t *rgb = s->frame->data[0]; + int pixel_limit = s->frame->linesize[0] * s->avctx->height; while (lines_to_change--) { pixel_ptr = row_ptr + (bytestream2_get_byte(&s->g) - 1) * 3; @@ -317,10 +317,10 @@ static void qtrle_decode_32bpp(QtrleContext *s, int row_ptr, int lines_to_change { int rle_code; int pixel_ptr; - int row_inc = s->frame.linesize[0]; + int row_inc = s->frame->linesize[0]; unsigned int argb; - uint8_t *rgb = s->frame.data[0]; - int pixel_limit = s->frame.linesize[0] * s->avctx->height; + uint8_t *rgb = s->frame->data[0]; + int pixel_limit = s->frame->linesize[0] * s->avctx->height; while (lines_to_change--) { pixel_ptr = row_ptr + (bytestream2_get_byte(&s->g) - 1) * 4; @@ -395,7 +395,9 @@ static av_cold int qtrle_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } - avcodec_get_frame_defaults(&s->frame); + s->frame = av_frame_alloc(); + if (!s->frame) + return AVERROR(ENOMEM); return 0; } @@ -411,7 +413,7 @@ static int qtrle_decode_frame(AVCodecContext *avctx, int ret; bytestream2_init(&s->g, avpkt->data, avpkt->size); - if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0) + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) return ret; /* check if this frame is even supposed to change */ @@ -438,7 +440,7 @@ static int qtrle_decode_frame(AVCodecContext *avctx, start_line = 0; height = s->avctx->height; } - row_ptr = s->frame.linesize[0] * start_line; + row_ptr = s->frame->linesize[0] * start_line; switch (avctx->bits_per_coded_sample) { case 1: @@ -486,16 +488,16 @@ static int qtrle_decode_frame(AVCodecContext *avctx, const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); if (pal) { - s->frame.palette_has_changed = 1; + s->frame->palette_has_changed = 1; memcpy(s->pal, pal, AVPALETTE_SIZE); } /* make the palette available on the way out */ - memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE); + memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE); } done: - if ((ret = av_frame_ref(data, &s->frame)) < 0) + if ((ret = av_frame_ref(data, s->frame)) < 0) return ret; *got_frame = 1; @@ -507,7 +509,7 @@ static av_cold int qtrle_decode_end(AVCodecContext *avctx) { QtrleContext *s = avctx->priv_data; - av_frame_unref(&s->frame); + av_frame_free(&s->frame); return 0; } -- cgit v1.2.3