* Deluxe Paint Animation decoder
* Copyright (c) 2009 Peter Ross
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
typedef struct AnmContext {
AVFrame frame;
+ int palette[AVPALETTE_COUNT];
+ GetByteContext gb;
int x; ///< x coordinate position
} AnmContext;
static av_cold int decode_init(AVCodecContext *avctx)
{
AnmContext *s = avctx->priv_data;
- const uint8_t *buf;
int i;
- avctx->pix_fmt = PIX_FMT_PAL8;
-
- if (avctx->extradata_size != 16*8 + 4*256)
- return -1;
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
s->frame.reference = 1;
- if (avctx->get_buffer(avctx, &s->frame) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ bytestream2_init(&s->gb, avctx->extradata, avctx->extradata_size);
+ if (bytestream2_get_bytes_left(&s->gb) < 16 * 8 + 4 * 256)
return -1;
- }
- buf = avctx->extradata + 16*8;
+ bytestream2_skipu(&s->gb, 16 * 8);
for (i = 0; i < 256; i++)
- ((uint32_t*)s->frame.data[1])[i] = bytestream_get_le32(&buf);
+ s->palette[i] = bytestream2_get_le32u(&s->gb);
return 0;
}
/**
* Perform decode operation
- * @param dst, dst_end Destination image buffer
- * @param buf, buf_end Source buffer (optional, see below)
+ * @param dst pointer to destination image buffer
+ * @param dst_end pointer to end of destination image buffer
+ * @param gb GetByteContext (optional, see below)
* @param pixel Fill color (optional, see below)
* @param count Pixel count
* @param x Pointer to x-axis counter
* @param linesize Destination image buffer linesize
* @return non-zero if destination buffer is exhausted
*
- * a copy operation is achieved when 'buf' is set
- * a fill operation is acheived when 'buf' is null and pixel is >= 0
- * a skip operation is acheived when 'buf' is null and pixel is < 0
+ * a copy operation is achieved when 'gb' is set
+ * a fill operation is achieved when 'gb' is null and pixel is >= 0
+ * a skip operation is achieved when 'gb' is null and pixel is < 0
*/
static inline int op(uint8_t **dst, const uint8_t *dst_end,
- const uint8_t **buf, const uint8_t *buf_end,
+ GetByteContext *gb,
int pixel, int count,
int *x, int width, int linesize)
{
int remaining = width - *x;
while(count > 0) {
int striplen = FFMIN(count, remaining);
- if (buf) {
- striplen = FFMIN(striplen, buf_end - *buf);
- memcpy(*dst, *buf, striplen);
- *buf += striplen;
+ if (gb) {
+ if (bytestream2_get_bytes_left(gb) < striplen)
+ goto exhausted;
+ bytestream2_get_bufferu(gb, *dst, striplen);
} else if (pixel >= 0)
memset(*dst, pixel, striplen);
*dst += striplen;
AVPacket *avpkt)
{
AnmContext *s = avctx->priv_data;
- const uint8_t *buf = avpkt->data;
const int buf_size = avpkt->size;
- const uint8_t *buf_end = buf + buf_size;
uint8_t *dst, *dst_end;
int count;
dst = s->frame.data[0];
dst_end = s->frame.data[0] + s->frame.linesize[0]*avctx->height;
- if (buf[0] != 0x42) {
+ bytestream2_init(&s->gb, avpkt->data, buf_size);
+
+ if (bytestream2_get_byte(&s->gb) != 0x42) {
av_log_ask_for_sample(avctx, "unknown record type\n");
return buf_size;
}
- if (buf[1]) {
+ if (bytestream2_get_byte(&s->gb)) {
av_log_ask_for_sample(avctx, "padding bytes not supported\n");
return buf_size;
}
- buf += 4;
+ bytestream2_skip(&s->gb, 2);
s->x = 0;
do {
/* if statements are ordered by probability */
-#define OP(buf, pixel, count) \
- op(&dst, dst_end, (buf), buf_end, (pixel), (count), &s->x, avctx->width, s->frame.linesize[0])
+#define OP(gb, pixel, count) \
+ op(&dst, dst_end, (gb), (pixel), (count), &s->x, avctx->width, s->frame.linesize[0])
- int type = bytestream_get_byte(&buf);
+ int type = bytestream2_get_byte(&s->gb);
count = type & 0x7F;
type >>= 7;
if (count) {
- if (OP(type ? NULL : &buf, -1, count)) break;
+ if (OP(type ? NULL : &s->gb, -1, count)) break;
} else if (!type) {
int pixel;
- count = bytestream_get_byte(&buf); /* count==0 gives nop */
- pixel = bytestream_get_byte(&buf);
+ count = bytestream2_get_byte(&s->gb); /* count==0 gives nop */
+ pixel = bytestream2_get_byte(&s->gb);
if (OP(NULL, pixel, count)) break;
} else {
int pixel;
- type = bytestream_get_le16(&buf);
+ type = bytestream2_get_le16(&s->gb);
count = type & 0x3FFF;
type >>= 14;
if (!count) {
}
continue;
}
- pixel = type == 3 ? bytestream_get_byte(&buf) : -1;
+ pixel = type == 3 ? bytestream2_get_byte(&s->gb) : -1;
if (type == 1) count += 0x4000;
- if (OP(type == 2 ? &buf : NULL, pixel, count)) break;
+ if (OP(type == 2 ? &s->gb : NULL, pixel, count)) break;
}
- } while (buf + 1 < buf_end);
+ } while (bytestream2_get_bytes_left(&s->gb) > 0);
+
+ memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;
}
AVCodec ff_anm_decoder = {
- "anm",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_ANM,
- sizeof(AnmContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame,
- CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
+ .name = "anm",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_ANM,
+ .priv_data_size = sizeof(AnmContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
};
projects / ffmpeg / blobdiff