[Ffmpeg-cvslog] r8411 - in trunk: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/targaenc.c libavformat/riff.c
gpoirier
subversion
Thu Mar 15 13:23:08 CET 2007
Author: gpoirier
Date: Thu Mar 15 13:23:08 2007
New Revision: 8411
Added:
trunk/libavcodec/targaenc.c
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/allcodecs.c
trunk/libavcodec/avcodec.h
trunk/libavformat/riff.c
Log:
Targa (.tga) encoder,
patch by Bobby Bingham % uhmmmm A gmail P com %
Only handles 24-bit BGR and 8-bit grayscale, no RLE at the moment either.
Original thread:
Date: Mar 11, 2007 7:58 PM
Subject: [Ffmpeg-devel] [PATCH] Targa encoder
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Thu Mar 15 13:23:08 2007
@@ -139,6 +139,7 @@ OBJS-$(CONFIG_SVQ1_DECODER) +
OBJS-$(CONFIG_SVQ1_ENCODER) += svq1.o
OBJS-$(CONFIG_SVQ3_DECODER) += h264.o
OBJS-$(CONFIG_TARGA_DECODER) += targa.o
+OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o
OBJS-$(CONFIG_THEORA_DECODER) += vp3.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c (original)
+++ trunk/libavcodec/allcodecs.c Thu Mar 15 13:23:08 2007
@@ -127,7 +127,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(SP5X, sp5x);
REGISTER_ENCDEC (SVQ1, svq1);
REGISTER_DECODER(SVQ3, svq3);
- REGISTER_DECODER(TARGA, targa);
+ REGISTER_ENCDEC (TARGA, targa);
REGISTER_DECODER(THEORA, theora);
REGISTER_DECODER(TIERTEXSEQVIDEO, tiertexseqvideo);
REGISTER_DECODER(TIFF, tiff);
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h (original)
+++ trunk/libavcodec/avcodec.h Thu Mar 15 13:23:08 2007
@@ -2203,6 +2203,7 @@ extern AVCodec snow_encoder;
extern AVCodec sonic_encoder;
extern AVCodec sonic_ls_encoder;
extern AVCodec svq1_encoder;
+extern AVCodec targa_encoder;
extern AVCodec vcr1_encoder;
extern AVCodec vorbis_encoder;
extern AVCodec wmav1_encoder;
Added: trunk/libavcodec/targaenc.c
==============================================================================
--- (empty file)
+++ trunk/libavcodec/targaenc.c Thu Mar 15 13:23:08 2007
@@ -0,0 +1,96 @@
+/*
+ * Targa (.tga) image encoder
+ * Copyright (c) 2007 Bobby Bingham
+ *
+ * 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"
+
+static int targa_encode_frame(AVCodecContext *avctx,
+ unsigned char *outbuf,
+ int buf_size, void *data){
+ AVFrame *p = data;
+ int i, n, linesize;
+ uint8_t *ptr, *out;
+
+ if(avctx->width > 0xffff || avctx->height > 0xffff) {
+ av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n");
+ return -1;
+ }
+ if(buf_size < avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height) + 45) {
+ av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
+ return -1;
+ }
+
+ p->pict_type= FF_I_TYPE;
+ p->key_frame= 1;
+
+ /* zero out the header and only set applicable fields */
+ memset(outbuf, 0, 11);
+ AV_WL16(outbuf+12, avctx->width);
+ AV_WL16(outbuf+14, avctx->height);
+ outbuf[17] = 0x20; /* origin is top-left. no alpha */
+
+ /* TODO: support alpha channel and other bit-depths. and RLE? */
+ switch(avctx->pix_fmt) {
+ case PIX_FMT_GRAY8:
+ outbuf[2] = 3; /* uncompressed grayscale image */
+ outbuf[16] = 8; /* bpp */
+ n = avctx->width;
+ break;
+ case PIX_FMT_BGR24:
+ outbuf[2] = 2; /* uncompressed true-color image */
+ outbuf[16] = 24; /* bpp */
+ n = 3 * avctx->width;
+ break;
+ default:
+ return -1;
+ }
+
+ out = outbuf + 18; /* skip past the header we just output */
+ ptr = p->data[0];
+ linesize = p->linesize[0];
+
+ for(i=0; i < avctx->height; i++) {
+ memcpy(out, ptr, n);
+ out += n;
+ ptr += linesize;
+ }
+
+ /* The standard recommends including this section, even if we don't use
+ * any of the features it affords. TODO: take advantage of the pixel
+ * aspect ratio and encoder ID fields available? */
+ memcpy(out, "\0\0\0\0\0\0\0\0TRUEVISION-XFILE.", 26);
+
+ return out + 26 - outbuf;
+}
+
+static int targa_encode_init(AVCodecContext *avctx)
+{
+ return 0;
+}
+
+AVCodec targa_encoder = {
+ .name = "targa",
+ .type = CODEC_TYPE_VIDEO,
+ .id = CODEC_ID_TARGA,
+ .priv_data_size = 0,
+ .init = targa_encode_init,
+ .encode = targa_encode_frame,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_GRAY8, -1},
+};
Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c (original)
+++ trunk/libavformat/riff.c Thu Mar 15 13:23:08 2007
@@ -167,6 +167,7 @@ const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') },
{ CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') },
{ CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') },
+ { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') },
{ CODEC_ID_NONE, 0 },
};
More information about the ffmpeg-cvslog
mailing list