[Ffmpeg-devel] CamStudio support

Reimar Döffinger Reimar.Doeffinger
Sun Jan 8 17:55:13 CET 2006


Hi,
the attached patch adds support for camstudio video:
Please tell me what you think about it, especially the configure part for
lzo.
URLs:
http://sourceforge.net/projects/camstudio/
one sample file is available at:
http://laugasson.pri.ee/windows/camstudio/
I would be interested to have more samples...

Greetings,
Reimar D?ffinger
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.227
diff -u -r1.227 configure
--- configure	3 Jan 2006 15:40:39 -0000	1.227
+++ configure	8 Jan 2006 16:50:21 -0000
@@ -67,6 +67,7 @@
 echo "  --disable-dv1394         disable DV1394 grabbing [default=no]"
 echo "  --disable-network        disable network support [default=no]"
 echo "  --disable-zlib           disable zlib [default=no]"
+echo "  --disable-lzo            disable lzo [default=no], requires --enable-gpl"
 echo "  --disable-simple_idct    disable simple IDCT routines [default=no]"
 echo "  --disable-vhook          disable video hooking support"
 echo "  --enable-gprof           enable profiling with gprof [$gprof]"
@@ -185,6 +186,7 @@
 dc1394="no"
 network="yes"
 zlib="yes"
+lzo="yes"
 libgsm="no"
 mp3lame="no"
 libogg="no"
@@ -485,6 +487,8 @@
   ;;
   --disable-zlib) zlib="no"
   ;;
+  --disable-lzo) lzo="no"
+  ;;
   --enable-a52) a52="yes"
   ;;
   --enable-a52bin) a52bin="yes"
@@ -985,6 +989,25 @@
 extralibs="$extralibs -lz"
 fi
 
+if test "$lzo" = "yes"; then
+# check for liblzo
+if test "$gpl" = "yes"; then
+cat > $TMPC << EOF
+#include <lzo1x.h>
+int main ( void ) {
+lzo_init();
+return 0;
+}
+EOF
+$cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -llzo 2> /dev/null || lzo="no"
+else
+lzo="no"
+fi
+fi
+if test "$lzo" = "yes"; then
+extralibs="$extralibs -llzo"
+fi
+
 # test for lrintf in math.h
 cat > $TMPC << EOF
 #define _ISOC9X_SOURCE  1
@@ -1245,6 +1268,7 @@
 fi
 echo "gprof enabled    $gprof"
 echo "zlib enabled     $zlib"
+echo "lzo enabled      $lzo"
 echo "libgsm enabled   $libgsm"
 echo "mp3lame enabled  $mp3lame"
 echo "libogg enabled   $libogg"
@@ -1592,6 +1616,11 @@
   echo "CONFIG_ZLIB=yes" >> config.mak
 fi
 
+if test "$lzo" = "yes" ; then
+  echo "#define CONFIG_LZO 1" >> $TMPH
+  echo "CONFIG_LZO=yes" >> config.mak
+fi
+
 if test "$libgsm" = "yes" ; then
   echo "#define CONFIG_LIBGSM 1" >> $TMPH
   echo "CONFIG_LIBGSM=yes" >> config.mak
Index: libavcodec/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.218
diff -u -r1.218 Makefile
--- libavcodec/Makefile	8 Jan 2006 14:53:37 -0000	1.218
+++ libavcodec/Makefile	8 Jan 2006 16:50:22 -0000
@@ -167,6 +167,9 @@
 ifeq ($(CONFIG_TSCC_DECODER),yes)
     OBJS+= tscc.o
 endif
+ifeq ($(CONFIG_CSCD_DECODER),yes)
+    OBJS+= cscd.o
+endif
 ifeq ($(CONFIG_ULTI_DECODER),yes)
     OBJS+= ulti.o
 endif
Index: libavcodec/allcodecs.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v
retrieving revision 1.122
diff -u -r1.122 allcodecs.c
--- libavcodec/allcodecs.c	6 Jan 2006 13:18:31 -0000	1.122
+++ libavcodec/allcodecs.c	8 Jan 2006 16:50:22 -0000
@@ -264,6 +264,9 @@
 #ifdef CONFIG_TSCC_DECODER
     register_avcodec(&tscc_decoder);
 #endif //CONFIG_TSCC_DECODER
+#ifdef CONFIG_CSCD_DECODER
+    register_avcodec(&cscd_decoder);
+#endif //CONFIG_CSCD_DECODER
 #ifdef CONFIG_ULTI_DECODER
     register_avcodec(&ulti_decoder);
 #endif //CONFIG_ULTI_DECODER
Index: libavcodec/avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.440
diff -u -r1.440 avcodec.h
--- libavcodec/avcodec.h	4 Jan 2006 16:31:23 -0000	1.440
+++ libavcodec/avcodec.h	8 Jan 2006 16:50:29 -0000
@@ -114,6 +114,7 @@
     CODEC_ID_FRAPS,
     CODEC_ID_TRUEMOTION2,
     CODEC_ID_BMP,
+    CODEC_ID_CSCD,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,
@@ -2190,6 +2191,7 @@
 extern AVCodec qtrle_decoder;
 extern AVCodec flac_decoder;
 extern AVCodec tscc_decoder;
+extern AVCodec cscd_decoder;
 extern AVCodec ulti_decoder;
 extern AVCodec qdraw_decoder;
 extern AVCodec xl_decoder;
Index: libavcodec/cscd.c
===================================================================
RCS file: libavcodec/cscd.c
diff -N libavcodec/cscd.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libavcodec/cscd.c	8 Jan 2006 16:50:29 -0000
@@ -0,0 +1,165 @@
+/*
+ * CamStudio decoder
+ * Copyright (c) 2006 Reimar Doeffinger
+ *
+ * This library 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 of the License, or (at your option) any later version.
+ *
+ * This library 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 this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "common.h"
+#include "avcodec.h"
+
+#ifdef CONFIG_ZLIB
+#include <zlib.h>
+#endif
+#ifdef CONFIG_LZO
+#include <lzo1x.h>
+#endif
+
+typedef struct {
+    AVFrame pic;
+    int linelen, height;
+    unsigned int decomp_size;
+    unsigned char* decomp_buf;
+} CamStudioContext;
+
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+                        uint8_t *buf, int buf_size) {
+    CamStudioContext *c = (CamStudioContext *)avctx->priv_data;
+    AVFrame *picture = data;
+
+    if (buf_size < 2) {
+        av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");
+        return -1;
+    }
+
+    if (c->pic.data[0])
+        avctx->release_buffer(avctx, &c->pic);
+    c->pic.reference = 1;
+    c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
+                          FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
+    if (avctx->get_buffer(avctx, &c->pic) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+        return -1;
+    }
+
+    // decompress data
+    switch ((buf[0] >> 1) & 7) {
+        case 0: { // lzo compression
+#ifdef CONFIG_LZO
+            unsigned int dlen = c->decomp_size;
+            if (lzo1x_decompress(&buf[2], buf_size - 2, c->decomp_buf, &dlen, NULL) != LZO_E_OK)
+                av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
+            break;
+#else
+            av_log(avctx, AV_LOG_ERROR, "compiled without lzo (GPL) support\n");
+            return -1;
+#endif
+        }
+        case 1: { // zlib compression
+#ifdef CONFIG_ZLIB
+            unsigned long dlen = c->decomp_size;
+            if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK)
+                av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n");
+            break;
+#else
+            av_log(avctx, AV_LOG_ERROR, "compiled without zlib support\n");
+            return -1;
+#endif
+        }
+        default:
+            av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
+            return -1;
+    }
+
+    // flip upside down, add difference frame
+    if (buf[0] & 1) { // keyframe
+        int i;
+        uint8_t *src = c->decomp_buf, *dst = c->pic.data[0];
+        c->pic.pict_type = FF_I_TYPE;
+        c->pic.key_frame = 1;
+        dst += (c->height - 1) * c->pic.linesize[0];
+        for (i = c->height; i; i--) {
+            memcpy(dst, src, c->linelen);
+            src += c->linelen;
+            dst -= c->pic.linesize[0];
+        }
+    } else {
+        int i, j;
+        uint8_t *src = c->decomp_buf, *dst = c->pic.data[0];
+        c->pic.pict_type = FF_P_TYPE;
+        c->pic.key_frame = 0;
+        dst += (c->height - 1) * c->pic.linesize[0];
+        for (i = c->height; i; i--) {
+            for (j = c->linelen; j; j--)
+                *dst++ += *src++;
+            dst -= c->pic.linesize[0] + c->linelen;
+        }
+    }
+
+    *picture = c->pic;
+    *data_size = sizeof(AVFrame);
+    return buf_size;
+}
+
+static int decode_init(AVCodecContext *avctx) {
+    CamStudioContext *c = (CamStudioContext *)avctx->priv_data;
+    if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) {
+        return 1;
+    }
+    avctx->has_b_frames = 0;
+    switch (avctx->bits_per_sample) {
+        case 16: avctx->pix_fmt = PIX_FMT_RGB565; break;
+        case 24: avctx->pix_fmt = PIX_FMT_BGR24; break;
+        case 32: avctx->pix_fmt = PIX_FMT_RGBA32; break;
+        default:
+            av_log(avctx, AV_LOG_ERROR,
+                   "CamStudio codec error: unvalid depth %i bpp\n",
+                   avctx->bits_per_sample);
+             return 1;
+    }
+    c->pic.data[0] = NULL;
+    c->linelen = avctx->width * avctx->bits_per_sample / 8;
+    c->height = avctx->height;
+    c->decomp_size = c->height * c->linelen;
+    c->decomp_buf = av_malloc(c->decomp_size);
+    if (!c->decomp_buf) {
+        av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
+        return 1;
+    }
+    return 0;
+}
+
+static int decode_end(AVCodecContext *avctx) {
+    CamStudioContext *c = (CamStudioContext *)avctx->priv_data;
+    av_freep(&c->decomp_buf);
+    if (c->pic.data[0])
+        avctx->release_buffer(avctx, &c->pic);
+    return 0;
+}
+
+AVCodec cscd_decoder = {
+    "camstudio",
+    CODEC_TYPE_VIDEO,
+    CODEC_ID_CSCD,
+    sizeof(CamStudioContext),
+    decode_init,
+    NULL,
+    decode_end,
+    decode_frame,
+    CODEC_CAP_DR1,
+};
+
Index: libavformat/avienc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avienc.c,v
retrieving revision 1.117
diff -u -r1.117 avienc.c
--- libavformat/avienc.c	22 Dec 2005 01:10:11 -0000	1.117
+++ libavformat/avienc.c	8 Jan 2006 16:50:31 -0000
@@ -193,6 +193,7 @@
     { CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') },
     { CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') },
     { CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') },
+    { CODEC_ID_CSCD, MKTAG('C', 'S', 'C', 'D') },
     { CODEC_ID_RAWVIDEO, 0 },
     { 0, 0 },
 };



More information about the ffmpeg-devel mailing list