[FFmpeg-cvslog] v410 encoder and decoder
Derek Buitenhuis
git at videolan.org
Thu Dec 15 00:19:50 CET 2011
ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Dec 13 14:33:48 2011 -0500| [80f6c0bb95bb90f599b0c76c0fbac5454eff3b2f] | committer: Diego Biurrun
v410 encoder and decoder
v410 is a packed 10-bit 4:4:4 YCbCr format used in
QuickTime.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Signed-off-by: Diego Biurrun <diego at biurrun.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80f6c0bb95bb90f599b0c76c0fbac5454eff3b2f
---
Changelog | 1 +
doc/general.texi | 3 +-
libavcodec/Makefile | 2 +
libavcodec/allcodecs.c | 1 +
libavcodec/avcodec.h | 1 +
libavcodec/v410dec.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/v410enc.c | 99 ++++++++++++++++++++++++++++++++++++++++++
libavcodec/version.h | 2 +-
libavformat/isom.c | 1 +
libavformat/riff.c | 1 +
10 files changed, 222 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index 0d72c53..b99935b 100644
--- a/Changelog
+++ b/Changelog
@@ -107,6 +107,7 @@ easier to use. The changes are:
- PCM format support in OMA demuxer
- CLJR encoder
- Dxtory capture format decoder
+- v410 QuickTime uncompressed 4:4:4 10-bit encoder and decoder
version 0.7:
diff --git a/doc/general.texi b/doc/general.texi
index bbeea64..88c044d 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -578,7 +578,8 @@ following image formats are supported:
@item Tiertex Limited SEQ video @tab @tab X
@tab Codec used in DOS CD-ROM FlashBack game.
@item Ut Video @tab @tab X
- at item V210 Quicktime Uncompressed 4:2:2 10-bit @tab X @tab X
+ at item v210 QuickTime uncompressed 4:2:2 10-bit @tab X @tab X
+ at item v410 QuickTime uncompressed 4:4:4 10-bit @tab X @tab X
@item VBLE Lossless Codec @tab @tab X
@item VMware Screen Codec / VMware Video @tab @tab X
@tab Codec used in videos captured by VMware.
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 07a3048..be9cd36 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -384,6 +384,8 @@ OBJS-$(CONFIG_ULTI_DECODER) += ulti.o
OBJS-$(CONFIG_UTVIDEO_DECODER) += utvideo.o
OBJS-$(CONFIG_V210_DECODER) += v210dec.o
OBJS-$(CONFIG_V210_ENCODER) += v210enc.o
+OBJS-$(CONFIG_V410_DECODER) += v410dec.o
+OBJS-$(CONFIG_V410_ENCODER) += v410enc.o
OBJS-$(CONFIG_V210X_DECODER) += v210x.o
OBJS-$(CONFIG_VB_DECODER) += vb.o
OBJS-$(CONFIG_VBLE_DECODER) += vble.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 208af1f..8a09b90 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -204,6 +204,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (UTVIDEO, utvideo);
REGISTER_ENCDEC (V210, v210);
REGISTER_DECODER (V210X, v210x);
+ REGISTER_ENCDEC (V410, v410);
REGISTER_DECODER (VB, vb);
REGISTER_DECODER (VBLE, vble);
REGISTER_DECODER (VC1, vc1);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index fe65a6e..1715bbb 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -253,6 +253,7 @@ enum CodecID {
CODEC_ID_BMV_VIDEO,
CODEC_ID_VBLE,
CODEC_ID_DXTORY,
+ CODEC_ID_V410,
/* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c
new file mode 100644
index 0000000..5df95f8
--- /dev/null
+++ b/libavcodec/v410dec.c
@@ -0,0 +1,113 @@
+/*
+ * v410 decoder
+ *
+ * Copyright (c) 2011 Derek Buitenhuis
+ *
+ * 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 "get_bits.h"
+
+static av_cold int v410_decode_init(AVCodecContext *avctx)
+{
+ avctx->pix_fmt = PIX_FMT_YUV444P10;
+ avctx->bits_per_raw_sample = 10;
+
+ if (avctx->width & 1) {
+ av_log(avctx, AV_LOG_ERROR, "v410 requires even width.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ avctx->coded_frame = avcodec_alloc_frame();
+
+ if (!avctx->coded_frame) {
+ av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
+ return AVERROR(ENOMEM);
+ }
+
+ return 0;
+}
+
+static int v410_decode_frame(AVCodecContext *avctx, void *data,
+ int *data_size, AVPacket *avpkt)
+{
+ AVFrame *pic = avctx->coded_frame;
+ uint8_t *src = avpkt->data;
+ uint16_t *y, *u, *v;
+ uint32_t val;
+ int i, j;
+
+ if (pic->data[0])
+ avctx->release_buffer(avctx, pic);
+
+ pic->reference = 0;
+
+ if (avctx->get_buffer(avctx, pic) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
+ return AVERROR(ENOMEM);
+ }
+
+ pic->key_frame = 1;
+ pic->pict_type = FF_I_TYPE;
+
+ y = (uint16_t *)pic->data[0];
+ u = (uint16_t *)pic->data[1];
+ v = (uint16_t *)pic->data[2];
+
+ for (i = 0; i < avctx->height; i++) {
+ for (j = 0; j < avctx->width; j++) {
+ val = AV_RL32(src);
+
+ u[j] = (val >> 2) & 0x3FF;
+ y[j] = (val >> 12) & 0x3FF;
+ v[j] = (val >> 22);
+
+ src += 4;
+ }
+
+ y += pic->linesize[0] >> 1;
+ u += pic->linesize[1] >> 1;
+ v += pic->linesize[2] >> 1;
+ }
+
+ *data_size = sizeof(AVFrame);
+ *(AVFrame *)data = *pic;
+
+ return avpkt->size;
+}
+
+static av_cold int v410_decode_close(AVCodecContext *avctx)
+{
+ if (avctx->coded_frame->data[0])
+ avctx->release_buffer(avctx, avctx->coded_frame);
+
+ av_freep(&avctx->coded_frame);
+
+ return 0;
+}
+
+AVCodec ff_v410_decoder = {
+ .name = "v410",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_V410,
+ .init = v410_decode_init,
+ .decode = v410_decode_frame,
+ .close = v410_decode_close,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"),
+};
diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c
new file mode 100644
index 0000000..1e600c3
--- /dev/null
+++ b/libavcodec/v410enc.c
@@ -0,0 +1,99 @@
+/*
+ * v410 encoder
+ *
+ * Copyright (c) 2011 Derek Buitenhuis
+ *
+ * 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 "put_bits.h"
+
+static av_cold int v410_encode_init(AVCodecContext *avctx)
+{
+ if (avctx->width & 1) {
+ av_log(avctx, AV_LOG_ERROR, "v410 requires even width.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ avctx->coded_frame = avcodec_alloc_frame();
+
+ if (!avctx->coded_frame) {
+ av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
+ return AVERROR(ENOMEM);
+ }
+
+ return 0;
+}
+
+static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf,
+ int buf_size, void *data)
+{
+ AVFrame *pic = data;
+ uint8_t *dst = buf;
+ uint16_t *y, *u, *v;
+ uint32_t val;
+ int i, j;
+ int output_size = 0;
+
+ if (buf_size < avctx->width * avctx->height * 3) {
+ av_log(avctx, AV_LOG_ERROR, "Out buffer is too small.\n");
+ return AVERROR(ENOMEM);
+ }
+
+ avctx->coded_frame->reference = 0;
+ avctx->coded_frame->key_frame = 1;
+ avctx->coded_frame->pict_type = FF_I_TYPE;
+
+ y = (uint16_t *)pic->data[0];
+ u = (uint16_t *)pic->data[1];
+ v = (uint16_t *)pic->data[2];
+
+ for (i = 0; i < avctx->height; i++) {
+ for (j = 0; j < avctx->width; j++) {
+ val = u[j] << 2;
+ val |= y[j] << 12;
+ val |= v[j] << 22;
+ AV_WL32(dst, val);
+ dst += 4;
+ output_size += 4;
+ }
+ y += pic->linesize[0] >> 1;
+ u += pic->linesize[1] >> 1;
+ v += pic->linesize[2] >> 1;
+ }
+
+ return output_size;
+}
+
+static av_cold int v410_encode_close(AVCodecContext *avctx)
+{
+ av_freep(&avctx->coded_frame);
+
+ return 0;
+}
+
+AVCodec ff_v410_encoder = {
+ .name = "v410",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_V410,
+ .init = v410_encode_init,
+ .encode = v410_encode_frame,
+ .close = v410_encode_close,
+ .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV444P10, PIX_FMT_NONE },
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"),
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index a41234f..d15fb48 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 53
-#define LIBAVCODEC_VERSION_MINOR 27
+#define LIBAVCODEC_VERSION_MINOR 28
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 6eb1827..eab304c 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -90,6 +90,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_R10K, MKTAG('R', '1', '0', 'g') }, /* UNCOMPRESSED 10BIT RGB */
{ CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */
+ { CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */
{ CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
{ CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
diff --git a/libavformat/riff.c b/libavformat/riff.c
index db3f958..1d226ab 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -196,6 +196,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') },
{ CODEC_ID_R210, MKTAG('r', '2', '1', '0') },
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') },
+ { CODEC_ID_V410, MKTAG('v', '4', '1', '0') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
{ CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') },
More information about the ffmpeg-cvslog
mailing list