[FFmpeg-cvslog] r20226 - in trunk: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/frwu.c libavformat/riff.c
reimar
subversion
Tue Oct 13 20:15:58 CEST 2009
Author: reimar
Date: Tue Oct 13 20:15:57 2009
New Revision: 20226
Log:
Add decoder for "forward uncompressed".
Fixes issue 1467.
Added:
trunk/libavcodec/frwu.c
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/allcodecs.c
trunk/libavcodec/avcodec.h
trunk/libavformat/riff.c
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile Tue Oct 13 15:40:03 2009 (r20225)
+++ trunk/libavcodec/Makefile Tue Oct 13 20:15:57 2009 (r20226)
@@ -98,6 +98,7 @@ OBJS-$(CONFIG_FLIC_DECODER) +
OBJS-$(CONFIG_FLV_DECODER) += h263dec.o h263.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o huffman.o
+OBJS-$(CONFIG_FRWU_DECODER) += frwu.o
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
OBJS-$(CONFIG_GIF_ENCODER) += gif.o
OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o mpegvideo.o error_resilience.o
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c Tue Oct 13 15:40:03 2009 (r20225)
+++ trunk/libavcodec/allcodecs.c Tue Oct 13 20:15:57 2009 (r20226)
@@ -96,6 +96,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (FLV, flv);
REGISTER_DECODER (FOURXM, fourxm);
REGISTER_DECODER (FRAPS, fraps);
+ REGISTER_DECODER (FRWU, frwu);
REGISTER_ENCDEC (GIF, gif);
REGISTER_ENCDEC (H261, h261);
REGISTER_ENCDEC (H263, h263);
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h Tue Oct 13 15:40:03 2009 (r20225)
+++ trunk/libavcodec/avcodec.h Tue Oct 13 20:15:57 2009 (r20226)
@@ -198,6 +198,7 @@ enum CodecID {
CODEC_ID_V210,
CODEC_ID_DPX,
CODEC_ID_MAD,
+ CODEC_ID_FRWU,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
Added: trunk/libavcodec/frwu.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/frwu.c Tue Oct 13 20:15:57 2009 (r20226)
@@ -0,0 +1,123 @@
+/*
+ * Forward Uncompressed
+ *
+ * Copyright (c) 2009 Reimar D?ffinger <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 "bytestream.h"
+#include "libavutil/intreadwrite.h"
+
+static av_cold int decode_init(AVCodecContext *avctx)
+{
+ if (avctx->width & 1) {
+ av_log(avctx, AV_LOG_ERROR, "FRWU needs even width\n");
+ return -1;
+ }
+ avctx->pix_fmt = PIX_FMT_UYVY422;
+
+ avctx->coded_frame = avcodec_alloc_frame();
+
+ return 0;
+}
+
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+ AVPacket *avpkt)
+{
+ int field;
+ AVFrame *pic = avctx->coded_frame;
+ const uint8_t *buf = avpkt->data;
+ const uint8_t *buf_end = buf + avpkt->size;
+
+ if (pic->data[0])
+ avctx->release_buffer(avctx, pic);
+
+ if (avpkt->size < avctx->width * 2 * avctx->height + 4 + 2*8) {
+ av_log(avctx, AV_LOG_ERROR, "Packet is too small.\n");
+ return -1;
+ }
+ if (bytestream_get_le32(&buf) != AV_RL32("FRW1")) {
+ av_log(avctx, AV_LOG_ERROR, "incorrect marker\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;
+ pic->interlaced_frame = 1;
+ pic->top_field_first = 1;
+
+ for (field = 0; field < 2; field++) {
+ int i;
+ int field_h = (avctx->height + !field) >> 1;
+ int field_size, min_field_size = avctx->width * 2 * field_h;
+ uint8_t *dst = pic->data[0];
+ if (buf_end - buf < 8)
+ return -1;
+ buf += 4; // flags? 0x80 == bottom field maybe?
+ field_size = bytestream_get_le32(&buf);
+ if (field_size < min_field_size) {
+ av_log(avctx, AV_LOG_ERROR, "Field size %i is too small (required %i)\n", field_size, min_field_size);
+ return -1;
+ }
+ if (buf_end - buf < field_size) {
+ av_log(avctx, AV_LOG_ERROR, "Packet is too small, need %i, have %i\n", field_size, (int)(buf_end - buf));
+ return -1;
+ }
+ if (field)
+ dst += pic->linesize[0];
+ for (i = 0; i < field_h; i++) {
+ memcpy(dst, buf, avctx->width * 2);
+ buf += avctx->width * 2;
+ dst += pic->linesize[0] << 1;
+ }
+ buf += field_size - min_field_size;
+ }
+
+ *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 frwu_decoder = {
+ "FRWU",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_FRWU,
+ 0,
+ decode_init,
+ NULL,
+ decode_close,
+ decode_frame,
+ CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
+};
Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c Tue Oct 13 15:40:03 2009 (r20225)
+++ trunk/libavformat/riff.c Tue Oct 13 20:15:57 2009 (r20226)
@@ -146,6 +146,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') },
{ 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_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