aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2011-03-15 09:37:48 +0100
committerAnton Khirnov <anton@khirnov.net>2011-03-28 16:55:03 +0200
commit42315dabce376fd7085e2a1bbab4d230d3d2ccd8 (patch)
tree927b4552fe18a0c33c635bc312fe95593c961cc2 /libavcodec
parentc6f951442efb34dd63e1e00b19bc30447075d5a3 (diff)
downloadffmpeg-42315dabce376fd7085e2a1bbab4d230d3d2ccd8.tar.gz
Chronomaster DFA decoder
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile1
-rw-r--r--libavcodec/allcodecs.c1
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/dfa.c395
-rw-r--r--libavcodec/version.h2
5 files changed, 399 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 85d9a34f3e..4cb61ca21e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -103,6 +103,7 @@ OBJS-$(CONFIG_COOK_DECODER) += cook.o
OBJS-$(CONFIG_CSCD_DECODER) += cscd.o
OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o
OBJS-$(CONFIG_DCA_DECODER) += dca.o synth_filter.o dcadsp.o
+OBJS-$(CONFIG_DFA_DECODER) += dfa.o
OBJS-$(CONFIG_DNXHD_DECODER) += dnxhddec.o dnxhddata.o
OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o \
mpegvideo_enc.o motion_est.o \
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 8de6ad8429..9aa29b7e3c 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -88,6 +88,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (CLJR, cljr);
REGISTER_DECODER (CSCD, cscd);
REGISTER_DECODER (CYUV, cyuv);
+ REGISTER_DECODER (DFA, dfa);
REGISTER_ENCDEC (DNXHD, dnxhd);
REGISTER_DECODER (DPX, dpx);
REGISTER_DECODER (DSICINVIDEO, dsicinvideo);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 150c99df1d..4cd78a373e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -212,6 +212,7 @@ enum CodecID {
CODEC_ID_LAGARITH,
CODEC_ID_PRORES,
CODEC_ID_JV,
+ CODEC_ID_DFA,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c
new file mode 100644
index 0000000000..1023197c38
--- /dev/null
+++ b/libavcodec/dfa.c
@@ -0,0 +1,395 @@
+/*
+ * Chronomaster DFA Video Decoder
+ * Copyright (c) 2011 Konstantin Shishkov
+ * based on work by Vladimir "VAG" Gneushev
+ *
+ * This file is part of Libav.
+ *
+ * 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.
+ *
+ * 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "libavutil/intreadwrite.h"
+#include "bytestream.h"
+#include "libavutil/lzo.h" // for av_memcpy_backptr
+
+typedef struct DfaContext {
+ AVFrame pic;
+
+ uint32_t pal[256];
+ uint8_t *frame_buf;
+} DfaContext;
+
+static av_cold int dfa_decode_init(AVCodecContext *avctx)
+{
+ DfaContext *s = avctx->priv_data;
+
+ avctx->pix_fmt = PIX_FMT_PAL8;
+
+ s->frame_buf = av_mallocz(avctx->width * avctx->height + AV_LZO_OUTPUT_PADDING);
+ if (!s->frame_buf)
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
+static int decode_copy(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end)
+{
+ const int size = width * height;
+
+ if (src_end - src < size)
+ return -1;
+ bytestream_get_buffer(&src, frame, size);
+ return 0;
+}
+
+static int decode_tsw1(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end)
+{
+ const uint8_t *frame_start = frame;
+ const uint8_t *frame_end = frame + width * height;
+ int mask = 0x10000, bitbuf = 0;
+ int v, offset, count, segments;
+
+ segments = bytestream_get_le32(&src);
+ frame += bytestream_get_le32(&src);
+ if (frame < frame_start || frame > frame_end)
+ return -1;
+ while (segments--) {
+ if (mask == 0x10000) {
+ if (src >= src_end)
+ return -1;
+ bitbuf = bytestream_get_le16(&src);
+ mask = 1;
+ }
+ if (src_end - src < 2 || frame_end - frame < 2)
+ return -1;
+ if (bitbuf & mask) {
+ v = bytestream_get_le16(&src);
+ offset = (v & 0x1FFF) << 1;
+ count = ((v >> 13) + 2) << 1;
+ if (frame - offset < frame_start || frame_end - frame < count)
+ return -1;
+ av_memcpy_backptr(frame, offset, count);
+ frame += count;
+ } else {
+ *frame++ = *src++;
+ *frame++ = *src++;
+ }
+ mask <<= 1;
+ }
+
+ return 0;
+}
+
+static int decode_dsw1(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end)
+{
+ const uint8_t *frame_start = frame;
+ const uint8_t *frame_end = frame + width * height;
+ int mask = 0x10000, bitbuf = 0;
+ int v, offset, count, segments;
+
+ segments = bytestream_get_le16(&src);
+ while (segments--) {
+ if (mask == 0x10000) {
+ if (src >= src_end)
+ return -1;
+ bitbuf = bytestream_get_le16(&src);
+ mask = 1;
+ }
+ if (src_end - src < 2 || frame_end - frame < 2)
+ return -1;
+ if (bitbuf & mask) {
+ v = bytestream_get_le16(&src);
+ offset = (v & 0x1FFF) << 1;
+ count = ((v >> 13) + 2) << 1;
+ if (frame - offset < frame_start || frame_end - frame < count)
+ return -1;
+ // can't use av_memcpy_backptr() since it can overwrite following pixels
+ for (v = 0; v < count; v++)
+ frame[v] = frame[v - offset];
+ frame += count;
+ } else if (bitbuf & (mask << 1)) {
+ frame += bytestream_get_le16(&src);
+ } else {
+ *frame++ = *src++;
+ *frame++ = *src++;
+ }
+ mask <<= 2;
+ }
+
+ return 0;
+}
+
+static int decode_dds1(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end)
+{
+ const uint8_t *frame_start = frame;
+ const uint8_t *frame_end = frame + width * height;
+ int mask = 0x10000, bitbuf = 0;
+ int i, v, offset, count, segments;
+
+ segments = bytestream_get_le16(&src);
+ while (segments--) {
+ if (mask == 0x10000) {
+ if (src >= src_end)
+ return -1;
+ bitbuf = bytestream_get_le16(&src);
+ mask = 1;
+ }
+ if (src_end - src < 2 || frame_end - frame < 2)
+ return -1;
+ if (bitbuf & mask) {
+ v = bytestream_get_le16(&src);
+ offset = (v & 0x1FFF) << 2;
+ count = ((v >> 13) + 2) << 1;
+ if (frame - offset < frame_start || frame_end - frame < count*2 + width)
+ return -1;
+ for (i = 0; i < count; i++) {
+ frame[0] = frame[1] =
+ frame[width] = frame[width + 1] = frame[-offset];
+
+ frame += 2;
+ }
+ } else if (bitbuf & (mask << 1)) {
+ frame += bytestream_get_le16(&src) * 2;
+ } else {
+ frame[0] = frame[1] =
+ frame[width] = frame[width + 1] = *src++;
+ frame += 2;
+ frame[0] = frame[1] =
+ frame[width] = frame[width + 1] = *src++;
+ frame += 2;
+ }
+ mask <<= 2;
+ }
+
+ return 0;
+}
+
+static int decode_bdlt(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end)
+{
+ const uint8_t *frame_end = frame + width * height;
+ uint8_t *line_ptr;
+ int count, lines, segments;
+
+ count = bytestream_get_le16(&src);
+ if (count >= height || width * count < 0)
+ return -1;
+ frame += width * count;
+ lines = bytestream_get_le16(&src);
+ if (frame + lines * width > frame_end || src >= src_end)
+ return -1;
+
+ while (lines--) {
+ line_ptr = frame;
+ frame += width;
+ segments = *src++;
+ while (segments--) {
+ if (src_end - src < 3)
+ return -1;
+ line_ptr += *src++;
+ if (line_ptr >= frame)
+ return -1;
+ count = (int8_t)*src++;
+ if (count >= 0) {
+ if (line_ptr + count > frame || src_end - src < count)
+ return -1;
+ bytestream_get_buffer(&src, line_ptr, count);
+ } else {
+ count = -count;
+ if (line_ptr + count > frame || src >= src_end)
+ return -1;
+ memset(line_ptr, *src++, count);
+ }
+ line_ptr += count;
+ }
+ }
+
+ return 0;
+}
+
+static int decode_wdlt(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end)
+{
+ const uint8_t *frame_end = frame + width * height;
+ uint8_t *line_ptr;
+ int count, i, v, lines, segments;
+
+ lines = bytestream_get_le16(&src);
+ if (frame + lines * width > frame_end || src >= src_end)
+ return -1;
+
+ while (lines--) {
+ segments = bytestream_get_le16(&src);
+ while ((segments & 0xC000) == 0xC000) {
+ frame -= (int16_t)segments * width;
+ if (frame >= frame_end)
+ return -1;
+ segments = bytestream_get_le16(&src);
+ }
+ if (segments & 0x8000) {
+ frame[width - 1] = segments & 0xFF;
+ segments = bytestream_get_le16(&src);
+ }
+ line_ptr = frame;
+ frame += width;
+ while (segments--) {
+ if (src_end - src < 2)
+ return -1;
+ line_ptr += *src++;
+ if (line_ptr >= frame)
+ return -1;
+ count = (int8_t)*src++;
+ if (count >= 0) {
+ if (line_ptr + count*2 > frame || src_end - src < count*2)
+ return -1;
+ bytestream_get_buffer(&src, line_ptr, count*2);
+ line_ptr += count * 2;
+ } else {
+ count = -count;
+ if (line_ptr + count*2 > frame || src_end - src < 2)
+ return -1;
+ v = bytestream_get_le16(&src);
+ for (i = 0; i < count; i++)
+ bytestream_put_le16(&line_ptr, v);
+ }
+ }
+ }
+
+ return 0;
+}
+
+static int decode_unk6(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end)
+{
+ return -1;
+}
+
+static int decode_blck(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end)
+{
+ memset(frame, 0, width * height);
+ return 0;
+}
+
+
+typedef int (*chunk_decoder)(uint8_t *frame, int width, int height,
+ const uint8_t *src, const uint8_t *src_end);
+
+static const chunk_decoder decoder[8] = {
+ decode_copy, decode_tsw1, decode_bdlt, decode_wdlt,
+ decode_unk6, decode_dsw1, decode_blck, decode_dds1,
+};
+
+static const char* chunk_name[8] = {
+ "COPY", "TSW1", "BDLT", "WDLT", "????", "DSW1", "BLCK", "DDS1"
+};
+
+static int dfa_decode_frame(AVCodecContext *avctx,
+ void *data, int *data_size,
+ AVPacket *avpkt)
+{
+ DfaContext *s = avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ const uint8_t *buf_end = avpkt->data + avpkt->size;
+ const uint8_t *tmp_buf;
+ uint32_t chunk_type, chunk_size;
+ uint8_t *dst;
+ int ret;
+ int i, pal_elems;
+
+ if (s->pic.data[0])
+ avctx->release_buffer(avctx, &s->pic);
+
+ if ((ret = avctx->get_buffer(avctx, &s->pic))) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+
+ while (buf < buf_end) {
+ chunk_size = AV_RL32(buf + 4);
+ chunk_type = AV_RL32(buf + 8);
+ buf += 12;
+ if (buf_end - buf < chunk_size) {
+ av_log(avctx, AV_LOG_ERROR, "Chunk size is too big (%d bytes)\n", chunk_size);
+ return -1;
+ }
+ if (!chunk_type)
+ break;
+ if (chunk_type == 1) {
+ pal_elems = FFMIN(chunk_size / 3, 256);
+ tmp_buf = buf;
+ for (i = 0; i < pal_elems; i++) {
+ s->pal[i] = bytestream_get_be24(&tmp_buf) << 2;
+ s->pal[i] |= (s->pal[i] >> 6) & 0x333;
+ }
+ s->pic.palette_has_changed = 1;
+ } else if (chunk_type <= 9) {
+ if (decoder[chunk_type - 2](s->frame_buf, avctx->width, avctx->height,
+ buf, buf + chunk_size)) {
+ av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n",
+ chunk_name[chunk_type - 2]);
+ return -1;
+ }
+ } else {
+ av_log(avctx, AV_LOG_WARNING, "Ignoring unknown chunk type %d\n",
+ chunk_type);
+ }
+ buf += chunk_size;
+ }
+
+ buf = s->frame_buf;
+ dst = s->pic.data[0];
+ for (i = 0; i < avctx->height; i++) {
+ memcpy(dst, buf, avctx->width);
+ dst += s->pic.linesize[0];
+ buf += avctx->width;
+ }
+ memcpy(s->pic.data[1], s->pal, sizeof(s->pal));
+
+ *data_size = sizeof(AVFrame);
+ *(AVFrame*)data = s->pic;
+
+ return avpkt->size;
+}
+
+static av_cold int dfa_decode_end(AVCodecContext *avctx)
+{
+ DfaContext *s = avctx->priv_data;
+
+ if (s->pic.data[0])
+ avctx->release_buffer(avctx, &s->pic);
+
+ av_freep(&s->frame_buf);
+
+ return 0;
+}
+
+AVCodec ff_dfa_decoder = {
+ "dfa",
+ AVMEDIA_TYPE_VIDEO,
+ CODEC_ID_DFA,
+ sizeof(DfaContext),
+ dfa_decode_init,
+ NULL,
+ dfa_decode_end,
+ dfa_decode_frame,
+ CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"),
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 73a6f3382d..a1c8365e5c 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 115
+#define LIBAVCODEC_VERSION_MINOR 116
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \