/*
* GIF decoder
- * Copyright (c) 2003 Fabrice Bellard.
- * Copyright (c) 2006 Baptiste Coudurier.
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2006 Baptiste Coudurier
*
* This file is part of FFmpeg.
*
//#define DEBUG
+#include "libavcore/imgutils.h"
#include "avcodec.h"
#include "bytestream.h"
#include "lzw.h"
int gce_delay;
/* LZW compatible decoder */
- uint8_t *bytestream;
- uint8_t *bytestream_end;
+ const uint8_t *bytestream;
+ const uint8_t *bytestream_end;
LZWState *lzw;
/* aux buffers */
n = (1 << bits_per_pixel);
spal = palette;
for(i = 0; i < n; i++) {
- s->image_palette[i] = (0xff << 24) |
- (spal[0] << 16) | (spal[1] << 8) | (spal[2]);
+ s->image_palette[i] = (0xff << 24) | AV_RB24(spal);
spal += 3;
}
for(; i < 256; i++)
y1 += 8;
ptr += linesize * 8;
if (y1 >= height) {
- y1 = 4;
- if (pass == 0)
- ptr = ptr1 + linesize * 4;
- else
- ptr = ptr1 + linesize * 2;
+ y1 = pass ? 2 : 4;
+ ptr = ptr1 + linesize * y1;
pass++;
}
break;
#endif
switch (code) {
case ',':
- if (gif_read_image(s) < 0)
- return -1;
- return 0;
- case ';':
- /* end of image */
- return -1;
+ return gif_read_image(s);
case '!':
if (gif_read_extension(s) < 0)
return -1;
break;
+ case ';':
+ /* end of image */
default:
/* error or erroneous EOF */
return -1;
return -1;
}
-static int gif_decode_init(AVCodecContext *avctx)
+static av_cold int gif_decode_init(AVCodecContext *avctx)
{
GifState *s = avctx->priv_data;
return 0;
}
-static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
+static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
GifState *s = avctx->priv_data;
AVFrame *picture = data;
int ret;
return -1;
avctx->pix_fmt = PIX_FMT_PAL8;
- if (avcodec_check_dimensions(avctx, s->screen_width, s->screen_height))
+ if (av_image_check_size(s->screen_width, s->screen_height, 0, avctx))
return -1;
avcodec_set_dimensions(avctx, s->screen_width, s->screen_height);
return s->bytestream - buf;
}
-static int gif_decode_close(AVCodecContext *avctx)
+static av_cold int gif_decode_close(AVCodecContext *avctx)
{
GifState *s = avctx->priv_data;
AVCodec gif_decoder = {
"gif",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_GIF,
sizeof(GifState),
gif_decode_init,
NULL,
gif_decode_close,
gif_decode_frame,
+ CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
};