From: bcoudurier Date: Tue, 12 May 2009 19:56:48 +0000 (+0000) Subject: V210 Uncompressed 4:2:2 10-bit encoder and decoder X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/8a2943107f40e99eea8e0e8fd8542f8d6f120959 V210 Uncompressed 4:2:2 10-bit encoder and decoder git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18801 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- diff --git a/Changelog b/Changelog index 161f09349..6282ad20f 100644 --- a/Changelog +++ b/Changelog @@ -17,6 +17,7 @@ version : - introduced avlanguage helpers in libavformat - 8088flex TMV demuxer and decoder - per-stream language-tags extraction in asfdec +- V210 decoder and encoder version 0.5: diff --git a/doc/general.texi b/doc/general.texi index ca1283a29..05e361b21 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -442,6 +442,7 @@ following image formats are supported: @tab encoding supported through external library libtheora @item Tiertex Limited SEQ video @tab @tab X @tab Codec used in DOS CD-ROM FlashBack game. +@item V210 Quicktime Uncompressed 4:2:2 10-bit @tab X @tab X @item VMware Screen Codec / VMware Video @tab @tab X @tab Codec used in videos captured by VMware. @item Westwood Studios VQA (Vector Quantized Animation) video @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5f51435ec..505d27830 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -230,6 +230,8 @@ OBJS-$(CONFIG_TSCC_DECODER) += tscc.o msrledec.o OBJS-$(CONFIG_TTA_DECODER) += tta.o OBJS-$(CONFIG_TXD_DECODER) += txd.o s3tc.o OBJS-$(CONFIG_ULTI_DECODER) += ulti.o +OBJS-$(CONFIG_V210_DECODER) += v210dec.o +OBJS-$(CONFIG_V210_ENCODER) += v210enc.o OBJS-$(CONFIG_V210X_DECODER) += v210x.o OBJS-$(CONFIG_VB_DECODER) += vb.o OBJS-$(CONFIG_VC1_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 41cf66194..e8d5d27fa 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -168,6 +168,7 @@ void avcodec_register_all(void) REGISTER_DECODER (TSCC, tscc); REGISTER_DECODER (TXD, txd); REGISTER_DECODER (ULTI, ulti); + REGISTER_ENCDEC (V210, v210); REGISTER_DECODER (V210X, v210x); REGISTER_DECODER (VB, vb); REGISTER_DECODER (VC1, vc1); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c849fea01..594da5f0b 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 28 +#define LIBAVCODEC_VERSION_MINOR 29 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -195,6 +195,7 @@ enum CodecID { CODEC_ID_AURA2, CODEC_ID_V210X, CODEC_ID_TMV, + CODEC_ID_V210, /* various PCM "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c new file mode 100644 index 000000000..da23ec43b --- /dev/null +++ b/libavcodec/v210dec.c @@ -0,0 +1,132 @@ +/* + * V210 decoder + * + * Copyright (C) 2009 Michael Niedermayer + * Copyright (c) 2009 Baptiste Coudurier + * + * 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 "libavutil/bswap.h" + +static av_cold int decode_init(AVCodecContext *avctx) +{ + if (avctx->width & 1) { + av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n"); + return -1; + } + if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) + return -1; + avctx->pix_fmt = PIX_FMT_YUV422P16; + avctx->bits_per_raw_sample = 10; + + avctx->coded_frame = avcodec_alloc_frame(); + + 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 *psrc = avpkt->data; + uint16_t *y, *u, *v; + int aligned_width = ((avctx->width + 47) / 48) * 48; + int stride = aligned_width * 8 / 3; + + if (pic->data[0]) + avctx->release_buffer(avctx, pic); + + if (avpkt->size < stride * avctx->height) { + av_log(avctx, AV_LOG_ERROR, "packet too small\n"); + return -1; + } + + pic->reference = 0; + if (avctx->get_buffer(avctx, pic) < 0) + return -1; + + y = pic->data[0]; + u = pic->data[1]; + v = pic->data[2]; + pic->pict_type = FF_I_TYPE; + pic->key_frame = 1; + +#define READ_PIXELS(a, b, c) \ + do { \ + val = le2me_32(*src++); \ + *a++ = val << 6; \ + *b++ = (val >> 4) & 0xFFC0; \ + *c++ = (val >> 14) & 0xFFC0; \ + } while (0); + + for (h = 0; h < avctx->height; h++) { + const uint32_t *src = psrc; + uint32_t val; + for (w = 0; w < avctx->width - 5; w += 6) { + READ_PIXELS(u, y, v); + READ_PIXELS(y, u, y); + READ_PIXELS(v, y, u); + READ_PIXELS(y, v, y); + } + if (w < avctx->width - 1) { + READ_PIXELS(u, y, v); + + val = le2me_32(*src++); + *y++ = val << 6; + } + if (w < avctx->width - 3) { + *u++ = (val >> 4) & 0xFFC0; + *y++ = (val >> 14) & 0xFFC0; + + val = le2me_32(*src++); + *v++ = val << 6; + *y++ = (val >> 4) & 0xFFC0; + } + + psrc += stride; + y += pic->linesize[0]/2 - avctx->width; + u += pic->linesize[1]/2 - avctx->width/2; + v += pic->linesize[2]/2 - avctx->width/2; + } + + *data_size = sizeof(AVFrame); + *(AVFrame*)data = *avctx->coded_frame; + + return avpkt->size; +} + +static av_cold int decode_close(AVCodecContext *avctx) +{ + av_freep(&avctx->coded_frame); + + return 0; +} + +AVCodec v210_decoder = { + "v210", + CODEC_TYPE_VIDEO, + CODEC_ID_V210, + 0, + decode_init, + NULL, + decode_close, + decode_frame, + CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), +}; diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c new file mode 100644 index 000000000..8bbd72091 --- /dev/null +++ b/libavcodec/v210enc.c @@ -0,0 +1,129 @@ +/* + * V210 encoder + * + * Copyright (C) 2009 Michael Niedermayer + * Copyright (c) 2009 Baptiste Coudurier + * + * 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 "libavcodec/bytestream.h" + +static av_cold int encode_init(AVCodecContext *avctx) +{ + if (avctx->width & 1) { + av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n"); + return -1; + } + + if (avctx->pix_fmt != PIX_FMT_YUV422P16) { + av_log(avctx, AV_LOG_ERROR, "v210 needs YUV422P16\n"); + return -1; + } + + if (avctx->bits_per_raw_sample != 10) + av_log(avctx, AV_LOG_WARNING, "bits per raw sample: %d != 10-bit\n", + avctx->bits_per_raw_sample); + + avctx->coded_frame = avcodec_alloc_frame(); + + avctx->coded_frame->key_frame = 1; + avctx->coded_frame->pict_type = FF_I_TYPE; + + return 0; +} + +static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) +{ + const AVFrame *pic = data; + int aligned_width = ((avctx->width + 47) / 48) * 48; + int stride = aligned_width * 8 / 3; + int h, w; + const uint16_t *y = pic->data[0]; + const uint16_t *u = pic->data[1]; + const uint16_t *v = pic->data[2]; + uint8_t *p = buf; + uint8_t *pdst = buf; + + if (buf_size < aligned_width * avctx->height * 8 / 3) { + av_log(avctx, AV_LOG_ERROR, "output buffer too small\n"); + return -1; + } + +#define WRITE_PIXELS(a, b, c) \ + do { \ + val = (*a++ >> 6) | \ + ((*b++ & 0xFFC0) << 4); \ + val|= (*c++ & 0xFFC0) << 14; \ + bytestream_put_le32(&p, val); \ + } while (0); + + for (h = 0; h < avctx->height; h++) { + uint32_t val; + for (w = 0; w < avctx->width - 5; w += 6) { + WRITE_PIXELS(u, y, v); + WRITE_PIXELS(y, u, y); + WRITE_PIXELS(v, y, u); + WRITE_PIXELS(y, v, y); + } + if (w < avctx->width - 1) { + WRITE_PIXELS(u, y, v); + + val = *y++ >> 6; + if (w == avctx->width - 2) + bytestream_put_le32(&p, val); + } + if (w < avctx->width - 3) { + val |=((*u++ & 0xFFC0) << 4) | + ((*y++ & 0xFFC0) << 14); + bytestream_put_le32(&p, val); + + val = (*v++ >> 6) | + (*y++ & 0xFFC0) << 4; + bytestream_put_le32(&p, val); + } + + pdst += stride; + memset(p, 0, pdst - p); + p = pdst; + y += pic->linesize[0]/2 - avctx->width; + u += pic->linesize[1]/2 - avctx->width/2; + v += pic->linesize[2]/2 - avctx->width/2; + } + + return p - buf; +} + +static av_cold int encode_close(AVCodecContext *avctx) +{ + av_freep(&avctx->coded_frame); + + return 0; +} + +AVCodec v210_encoder = { + "v210", + CODEC_TYPE_VIDEO, + CODEC_ID_V210, + 0, + encode_init, + encode_frame, + encode_close, + .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV422P16, -1}, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), +};