[FFmpeg-cvslog] r20891 - in trunk: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/r210dec.c libavformat/isom.c libavformat/riff.c
reimar
subversion
Thu Dec 17 19:56:56 CET 2009
Author: reimar
Date: Thu Dec 17 19:56:56 2009
New Revision: 20891
Log:
Add decoder for R210 (uncompressed 10-bit RGB) codec.
Added:
trunk/libavcodec/r210dec.c
Modified:
trunk/Changelog
trunk/doc/general.texi
trunk/libavcodec/Makefile
trunk/libavcodec/allcodecs.c
trunk/libavcodec/avcodec.h
trunk/libavformat/isom.c
trunk/libavformat/riff.c
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog Thu Dec 17 18:25:31 2009 (r20890)
+++ trunk/Changelog Thu Dec 17 19:56:56 2009 (r20891)
@@ -45,6 +45,7 @@ version <next>:
- -formats option split into -formats, -codecs, -bsfs, and -protocols
- IV8 demuxer
- CDG demuxer and decoder
+- R210 decoder
Modified: trunk/doc/general.texi
==============================================================================
--- trunk/doc/general.texi Thu Dec 17 18:25:31 2009 (r20890)
+++ trunk/doc/general.texi Thu Dec 17 19:56:56 2009 (r20891)
@@ -430,6 +430,7 @@ following image formats are supported:
@tab fourcc: 'smc '
@item QuickTime video (RPZA) @tab @tab X
@tab fourcc: rpza
+ at item R210 Quicktime Uncompressed RGB 10-bit @tab @tab X
@item Raw Video @tab X @tab X
@item RealVideo 1.0 @tab X @tab X
@item RealVideo 2.0 @tab X @tab X
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile Thu Dec 17 18:25:31 2009 (r20890)
+++ trunk/libavcodec/Makefile Thu Dec 17 19:56:56 2009 (r20891)
@@ -247,6 +247,7 @@ OBJS-$(CONFIG_QDRAW_DECODER) +
OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o
OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o
OBJS-$(CONFIG_QTRLE_ENCODER) += qtrleenc.o
+OBJS-$(CONFIG_R210_DECODER) += r210dec.o
OBJS-$(CONFIG_RA_144_DECODER) += ra144.o celp_filters.o
OBJS-$(CONFIG_RA_288_DECODER) += ra288.o celp_math.o celp_filters.o
OBJS-$(CONFIG_RAWVIDEO_DECODER) += rawdec.o
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c Thu Dec 17 18:25:31 2009 (r20890)
+++ trunk/libavcodec/allcodecs.c Thu Dec 17 19:56:56 2009 (r20891)
@@ -146,6 +146,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (QDRAW, qdraw);
REGISTER_DECODER (QPEG, qpeg);
REGISTER_ENCDEC (QTRLE, qtrle);
+ REGISTER_DECODER (R210, r210);
REGISTER_ENCDEC (RAWVIDEO, rawvideo);
REGISTER_DECODER (RL2, rl2);
REGISTER_ENCDEC (ROQ, roq);
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h Thu Dec 17 18:25:31 2009 (r20890)
+++ trunk/libavcodec/avcodec.h Thu Dec 17 19:56:56 2009 (r20891)
@@ -201,6 +201,7 @@ enum CodecID {
CODEC_ID_FRWU,
CODEC_ID_FLASHSV2,
CODEC_ID_CDGRAPHICS,
+ CODEC_ID_R210,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
Added: trunk/libavcodec/r210dec.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/r210dec.c Thu Dec 17 19:56:56 2009 (r20891)
@@ -0,0 +1,104 @@
+/*
+ * R210 decoder
+ *
+ * Copyright (c) 2009 Reimar Doeffinger <Reimar.Doeffinger at gmx.de>
+ *
+ * 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)
+{
+ avctx->pix_fmt = PIX_FMT_RGB48;
+ 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 uint32_t *src = (const uint32_t *)avpkt->data;
+ int aligned_width = FFALIGN(avctx->width, 64);
+ uint8_t *dst_line;
+
+ if (pic->data[0])
+ avctx->release_buffer(avctx, pic);
+
+ if (avpkt->size < 4 * aligned_width * 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;
+
+ pic->pict_type = FF_I_TYPE;
+ pic->key_frame = 1;
+ dst_line = pic->data[0];
+
+ for (h = 0; h < avctx->height; h++) {
+ uint16_t *dst = (uint16_t *)dst_line;
+ for (w = 0; w < avctx->width; w++) {
+ uint32_t pixel = be2me_32(*src++);
+ uint16_t r, g, b;
+ r = pixel << 6;
+ g = (pixel >> 4) & 0xffc0;
+ b = (pixel >> 14) & 0xffc0;
+ *dst++ = r | (r >> 10);
+ *dst++ = g | (g >> 10);
+ *dst++ = b | (b >> 10);
+ }
+ src += aligned_width - avctx->width;
+ dst_line += pic->linesize[0];
+ }
+
+ *data_size = sizeof(AVFrame);
+ *(AVFrame*)data = *avctx->coded_frame;
+
+ 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 r210_decoder = {
+ "r210",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_R210,
+ 0,
+ decode_init,
+ NULL,
+ decode_close,
+ decode_frame,
+ CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"),
+};
Modified: trunk/libavformat/isom.c
==============================================================================
--- trunk/libavformat/isom.c Thu Dec 17 18:25:31 2009 (r20890)
+++ trunk/libavformat/isom.c Thu Dec 17 19:56:56 2009 (r20891)
@@ -67,6 +67,7 @@ const AVCodecTag codec_movvideo_tags[] =
{ CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */
{ CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */
+ { 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_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c Thu Dec 17 18:25:31 2009 (r20890)
+++ trunk/libavformat/riff.c Thu Dec 17 19:56:56 2009 (r20891)
@@ -163,6 +163,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
{ CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') },
+ { CODEC_ID_R210, MKTAG('r', '2', '1', '0') },
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
More information about the ffmpeg-cvslog
mailing list