[FFmpeg-devel] [PATCH] v410 encoder and decoder
Michael Niedermayer
michaelni at gmx.at
Tue Dec 13 19:10:13 CET 2011
On Mon, Dec 12, 2011 at 11:36:52PM -0500, Derek Buitenhuis wrote:
> v410 is a packed 10-bit 4:4:4 YCbCr format used in
> QuickTime.
>
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> ---
> Changelog | 1 +
> MAINTAINERS | 1 +
> doc/general.texi | 1 +
> libavcodec/Makefile | 2 +
> libavcodec/allcodecs.c | 1 +
> libavcodec/avcodec.h | 1 +
> libavcodec/v410dec.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++
> libavcodec/v410enc.c | 98 +++++++++++++++++++++++++++++++++++++++++
> libavcodec/version.h | 2 +-
> libavformat/isom.c | 2 +
> libavformat/riff.c | 1 +
> 11 files changed, 222 insertions(+), 1 deletions(-)
> create mode 100644 libavcodec/v410dec.c
> create mode 100644 libavcodec/v410enc.c
>
> diff --git a/Changelog b/Changelog
> index 89d1893..e4af553 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -134,6 +134,7 @@ easier to use. The changes are:
> - new option: -report
> - Dxtory capture format decoder
> - cellauto source
> +- V410 encoder and decoder
>
>
> version 0.8:
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a254985..de4ed91 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -218,6 +218,7 @@ Codecs:
> tta.c Alex Beregszaszi, Jaikrishnan Menon
> txd.c Ivo van Poorten
> ulti* Kostya Shishkov
> + v410*.c Derek Buitenhuis
> vb.c Kostya Shishkov
> vble.c Derek Buitenhuis
> vc1* Kostya Shishkov
> diff --git a/doc/general.texi b/doc/general.texi
> index fc4ee1c..42db0e2 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -602,6 +602,7 @@ following image formats are supported:
> @tab Codec used in DOS CD-ROM FlashBack game.
> @item Ut Video @tab @tab X
> @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 6410ed4..1a651c1 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -413,6 +413,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 9e13047..4c85056 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -215,6 +215,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 a196707..4290f8b 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -254,6 +254,7 @@ enum CodecID {
> CODEC_ID_BMV_VIDEO,
> CODEC_ID_VBLE,
> CODEC_ID_DXTORY,
> + CODEC_ID_V410,
> CODEC_ID_UTVIDEO = 0x800,
> CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),
>
> diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c
> new file mode 100644
> index 0000000..f4fa5f7
> --- /dev/null
> +++ b/libavcodec/v410dec.c
> @@ -0,0 +1,113 @@
> +/*
> + * v410 decoder
> + *
> + * Copyright (c) 2011 Derek Buitenhuis
> + *
> + * 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
> + */
> +
> +#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;
> +
trailing whitespace, not that i care but the git push hook cares ;)
> + if (avctx->width & 1) {
> + av_log(avctx, AV_LOG_ERROR, "v410 requires width be even.\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;
> + int val;
should be a unsigned type
> + int i, j;
> +
> + pic->reference = 0;
> +
> + if (pic->data[0])
> + avctx->release_buffer(avctx, pic);
> +
> + if (avctx->get_buffer(avctx, pic) < 0) {
> + av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
> + return AVERROR(ENOMEM);
> + }
it feels a bid odd to set reference before release_buffer instead of
just before get_buffer
> +
> + 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) & 0x3FF;
teh & is unneeded when val is unsigned
> +
> + 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..1ca6520
> --- /dev/null
> +++ b/libavcodec/v410enc.c
> @@ -0,0 +1,98 @@
> +/*
> + * v410 encoder
> + *
> + * Copyright (c) 2011 Derek Buitenhuis
> + *
> + * 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
> + */
> +
> +#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 width be even.\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;
> +
> + if (buf_size < avctx->width * avctx->height * 3) {
> + av_log(avctx, AV_LOG_ERROR, "Out buffer is too small.\n");
> + return AVERROR(ENOMEM);
> + }
> +
> + pic->reference = 0;
> + pic->key_frame = 1;
> + pic->pict_type = FF_I_TYPE;
if you dont copy these to coded_frame then i dont think they have any
effect
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
He who knows, does not speak. He who speaks, does not know. -- Lao Tsu
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20111213/d5830162/attachment.asc>
More information about the ffmpeg-devel
mailing list