[FFmpeg-cvslog] Dxtory capture format decoder
Kostya Shishkov
git at videolan.org
Sun Dec 11 01:12:48 CET 2011
ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Fri Dec 9 11:06:02 2011 +0100| [19341c58e0f7210046286e08ae5f955a14ee3e3f] | committer: Anton Khirnov
Dxtory capture format decoder
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19341c58e0f7210046286e08ae5f955a14ee3e3f
---
Changelog | 1 +
doc/general.texi | 1 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/avcodec.h | 1 +
libavcodec/dxtory.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++
libavformat/riff.c | 1 +
7 files changed, 115 insertions(+), 0 deletions(-)
diff --git a/Changelog b/Changelog
index ab4136a..0d72c53 100644
--- a/Changelog
+++ b/Changelog
@@ -106,6 +106,7 @@ easier to use. The changes are:
- Playstation Portable PMP format demuxer
- PCM format support in OMA demuxer
- CLJR encoder
+- Dxtory capture format decoder
version 0.7:
diff --git a/doc/general.texi b/doc/general.texi
index db1e0d4..b4838f5 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -452,6 +452,7 @@ following image formats are supported:
@item Duck TrueMotion 2.0 @tab @tab X
@tab fourcc: TM20
@item DV (Digital Video) @tab X @tab X
+ at item Dxtory capture format @tab @tab X
@item Feeble Files/ScummVM DXA @tab @tab X
@tab Codec originally used in Feeble Files game.
@item Electronic Arts CMV video @tab @tab X
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index a78cd81..383039a 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -125,6 +125,7 @@ OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o
OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o dvdata.o
OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o dvdata.o
OBJS-$(CONFIG_DXA_DECODER) += dxa.o
+OBJS-$(CONFIG_DXTORY_DECODER) += dxtory.o
OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o eac3_data.o
OBJS-$(CONFIG_EAC3_ENCODER) += eac3enc.o ac3enc.o ac3enc_float.o \
ac3tab.o ac3.o kbdwin.o eac3_data.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 59795b1..208af1f 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -96,6 +96,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (DSICINVIDEO, dsicinvideo);
REGISTER_ENCDEC (DVVIDEO, dvvideo);
REGISTER_DECODER (DXA, dxa);
+ REGISTER_DECODER (DXTORY, dxtory);
REGISTER_DECODER (EACMV, eacmv);
REGISTER_DECODER (EAMAD, eamad);
REGISTER_DECODER (EATGQ, eatgq);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 83fb39b..669afe8 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -252,6 +252,7 @@ enum CodecID {
CODEC_ID_UTVIDEO,
CODEC_ID_BMV_VIDEO,
CODEC_ID_VBLE,
+ CODEC_ID_DXTORY,
/* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
new file mode 100644
index 0000000..5f67fbd
--- /dev/null
+++ b/libavcodec/dxtory.c
@@ -0,0 +1,109 @@
+/*
+ * Dxtory decoder
+ *
+ * Copyright (c) 2011 Konstantin Shishkov
+ *
+ * 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"
+
+static av_cold int decode_init(AVCodecContext *avctx)
+{
+ avctx->pix_fmt = PIX_FMT_YUV420P;
+ avctx->coded_frame = avcodec_alloc_frame();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+ AVPacket *avpkt)
+{
+ int h, w;
+ AVFrame *pic = avctx->coded_frame;
+ const uint8_t *src = avpkt->data;
+ uint8_t *Y1, *Y2, *U, *V;
+ int ret;
+
+ if (pic->data[0])
+ avctx->release_buffer(avctx, pic);
+
+ if (avpkt->size < avctx->width * avctx->height * 3 / 2 + 16) {
+ av_log(avctx, AV_LOG_ERROR, "packet too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ pic->reference = 0;
+ if ((ret = avctx->get_buffer(avctx, pic)) < 0)
+ return ret;
+
+ pic->pict_type = AV_PICTURE_TYPE_I;
+ pic->key_frame = 1;
+
+ if (AV_RL32(src) != 0x01000002) {
+ av_log_ask_for_sample(avctx, "Unknown frame header %X\n", AV_RL32(src));
+ return AVERROR_PATCHWELCOME;
+ }
+ src += 16;
+
+ Y1 = pic->data[0];
+ Y2 = pic->data[0] + pic->linesize[0];
+ U = pic->data[1];
+ V = pic->data[2];
+ for (h = 0; h < avctx->height; h += 2) {
+ for (w = 0; w < avctx->width; w += 2) {
+ AV_WN16A(Y1 + w, AV_RN16A(src));
+ AV_WN16A(Y2 + w, AV_RN16A(src + 2));
+ U[w >> 1] = src[4] + 0x80;
+ V[w >> 1] = src[5] + 0x80;
+ src += 6;
+ }
+ Y1 += pic->linesize[0] << 1;
+ Y2 += pic->linesize[0] << 1;
+ U += pic->linesize[1];
+ V += pic->linesize[2];
+ }
+
+ *data_size = sizeof(AVFrame);
+ *(AVFrame*)data = *pic;
+
+ return avpkt->size;
+}
+
+static av_cold int decode_close(AVCodecContext *avctx)
+{
+ AVFrame *pic = avctx->coded_frame;
+ if (pic->data[0])
+ avctx->release_buffer(avctx, pic);
+ av_freep(&avctx->coded_frame);
+
+ return 0;
+}
+
+AVCodec ff_dxtory_decoder = {
+ .name = "dxtory",
+ .long_name = NULL_IF_CONFIG_SMALL("Dxtory"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_DXTORY,
+ .init = decode_init,
+ .close = decode_close,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+};
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 1161e97..db3f958 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -280,6 +280,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '0') },
{ CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '2') },
{ CODEC_ID_VBLE, MKTAG('V', 'B', 'L', 'E') },
+ { CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') },
{ CODEC_ID_NONE, 0 }
};
More information about the ffmpeg-cvslog
mailing list