From a1ae40fd0de6d9daf224916750238c1eab00ec33 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Sun, 10 Jan 2010 05:41:36 +0000 Subject: [PATCH] Deluxe Paint Animation decoder Originally committed as revision 21117 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/general.texi | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/anm.c | 197 +++++++++++++++++++++++++++++++++++++++++ libavcodec/avcodec.h | 3 +- 5 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 libavcodec/anm.c diff --git a/doc/general.texi b/doc/general.texi index b0668dff88..6e7212cd36 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -345,6 +345,7 @@ following image formats are supported: @item Creative YUV (CYUV) @tab @tab X @item Dirac @tab E @tab E @tab supported through external libdirac/libschroedinger libraries +@item Deluxe Paint Animation @tab @tab X @item DNxHD @tab X @tab X @tab aka SMPTE VC3 @item Duck TrueMotion 1.0 @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 766f0f74ea..4fe6e2b1c5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -50,6 +50,7 @@ OBJS-$(CONFIG_ALAC_DECODER) += alac.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o OBJS-$(CONFIG_ALS_DECODER) += alsdec.o OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o +OBJS-$(CONFIG_ANM_DECODER) += anm.o OBJS-$(CONFIG_APE_DECODER) += apedec.o OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o mpeg12data.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 20d64ff24c..befff6e931 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -64,6 +64,7 @@ void avcodec_register_all(void) /* video codecs */ REGISTER_DECODER (AASC, aasc); REGISTER_DECODER (AMV, amv); + REGISTER_DECODER (ANM, anm); REGISTER_ENCDEC (ASV1, asv1); REGISTER_ENCDEC (ASV2, asv2); REGISTER_DECODER (AURA, aura); diff --git a/libavcodec/anm.c b/libavcodec/anm.c new file mode 100644 index 0000000000..963f077194 --- /dev/null +++ b/libavcodec/anm.c @@ -0,0 +1,197 @@ +/* + * Deluxe Paint Animation decoder + * Copyright (c) 2009 Peter Ross + * + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file libavcodec/anm.c + * Deluxe Paint Animation decoder + */ + +#include "avcodec.h" +#include "bytestream.h" + +typedef struct AnmContext { + AVFrame frame; + 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; + + s->frame.reference = 1; + if (avctx->get_buffer(avctx, &s->frame) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return -1; + } + + buf = avctx->extradata + 16*8; + for (i = 0; i < 256; i++) + ((uint32_t*)s->frame.data[1])[i] = bytestream_get_le32(&buf); + + return 0; +} + +/** + * Perform decode operation + * @param dst, dst_end Destination image buffer + * @param buf, buf_end Source buffer (optional, see below) + * @param pixel Fill color (optional, see below) + * @param count Pixel count + * @param x Pointer to x-axis counter + * @param width Image width + * @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 + */ +static inline int op(uint8_t **dst, const uint8_t *dst_end, + const uint8_t **buf, const uint8_t *buf_end, + 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; + } else if (pixel >= 0) + memset(*dst, pixel, striplen); + *dst += striplen; + remaining -= striplen; + count -= striplen; + if (remaining <= 0) { + *dst += linesize - width; + remaining = width; + } + if (linesize > 0) { + if (*dst >= dst_end) goto exhausted; + } else { + if (*dst <= dst_end) goto exhausted; + } + } + *x = width - remaining; + return 0; + +exhausted: + *x = width - remaining; + return 1; +} + +static int decode_frame(AVCodecContext *avctx, + void *data, int *data_size, + 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; + + if(avctx->reget_buffer(avctx, &s->frame) < 0){ + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return -1; + } + dst = s->frame.data[0]; + dst_end = s->frame.data[0] + s->frame.linesize[0]*avctx->height; + + if (buf[0] != 0x42) { + av_log_ask_for_sample(avctx, "unknown record type\n"); + return buf_size; + } + if (buf[1]) { + av_log_ask_for_sample(avctx, "padding bytes not supported\n"); + return buf_size; + } + buf += 4; + + 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]) + + int type = bytestream_get_byte(&buf); + count = type & 0x7F; + type >>= 7; + if (count) { + if (OP(type ? NULL : &buf, -1, count)) break; + } else if (!type) { + int pixel; + count = bytestream_get_byte(&buf); /* count==0 gives nop */ + pixel = bytestream_get_byte(&buf); + if (OP(NULL, pixel, count)) break; + } else { + int pixel; + type = bytestream_get_le16(&buf); + count = type & 0x3FFF; + type >>= 14; + if (!count) { + if (type == 0) + break; // stop + if (type == 2) { + av_log_ask_for_sample(avctx, "unknown opcode"); + return AVERROR_INVALIDDATA; + } + continue; + } + pixel = type == 3 ? bytestream_get_byte(&buf) : -1; + if (type == 1) count += 0x4000; + if (OP(type == 2 ? &buf : NULL, pixel, count)) break; + } + } while (buf + 1 < buf_end); + + *data_size = sizeof(AVFrame); + *(AVFrame*)data = s->frame; + return buf_size; +} + +static av_cold int decode_end(AVCodecContext *avctx) +{ + AnmContext *s = avctx->priv_data; + if (s->frame.data[0]) + avctx->release_buffer(avctx, &s->frame); + return 0; +} + +AVCodec anm_decoder = { + "anm", + CODEC_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"), +}; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c982a642f0..deb732fe3a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 45 +#define LIBAVCODEC_VERSION_MINOR 46 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -202,6 +202,7 @@ enum CodecID { CODEC_ID_FLASHSV2, CODEC_ID_CDGRAPHICS, CODEC_ID_R210, + CODEC_ID_ANM, /* various PCM "codecs" */ CODEC_ID_PCM_S16LE= 0x10000,