From: Reimar Döffinger Date: Mon, 9 Jan 2006 15:41:39 +0000 (+0000) Subject: CamStudio decoder, only 32 bit lzo mode is tested X-Git-Tag: v0.5~13321 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e0f80bd744996df4429624373f96442e6fa5ec07;p=coroid%2Flibav_saccubus.git CamStudio decoder, only 32 bit lzo mode is tested Originally committed as revision 4836 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/configure b/configure index 3fe8d43fc..d72670455 100755 --- a/configure +++ b/configure @@ -67,6 +67,7 @@ echo " --disable-bktr disable bktr video grabbing [default=no]" 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]" 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 @@ dv1394="yes" dc1394="no" network="yes" zlib="yes" +lzo="yes" libgsm="no" mp3lame="no" libogg="no" @@ -485,6 +487,8 @@ for opt do ;; --disable-zlib) zlib="no" ;; + --disable-lzo) lzo="no" + ;; --enable-a52) a52="yes" ;; --enable-a52bin) a52bin="yes" @@ -985,6 +989,23 @@ if test "$zlib" = "yes"; then extralibs="$extralibs -lz" fi +if test "$lzo" = "yes" -a "$gpl" = "yes"; then +# check for liblzo +cat > $TMPC << EOF +#include +int main ( void ) { +lzo_init(); +return 0; +} +EOF +$cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -llzo 2> /dev/null || lzo="no" +else +lzo="no" +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 +1266,7 @@ echo "AltiVec enabled $altivec" 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 +1614,11 @@ if test "$zlib" = "yes" ; then 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 diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b22f1633d..5f24dbb9a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -167,6 +167,9 @@ endif 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 diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 29a513a2b..73b58f54d 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -264,6 +264,9 @@ void avcodec_register_all(void) #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 diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0aafb03f4..033cec225 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -114,6 +114,7 @@ enum CodecID { 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 sonic_decoder; 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; diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c new file mode 100644 index 000000000..fdc336d4d --- /dev/null +++ b/libavcodec/cscd.c @@ -0,0 +1,270 @@ +/* + * 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 +#include + +#include "common.h" +#include "avcodec.h" + +#ifdef CONFIG_ZLIB +#include +#endif +#ifdef CONFIG_LZO +#include +#endif + +typedef struct { + AVFrame pic; + int linelen, height, bpp; + unsigned int decomp_size; + unsigned char* decomp_buf; +} CamStudioContext; + +static void copy_frame_default(AVFrame *f, uint8_t *src, + int linelen, int height) { + int i; + uint8_t *dst = f->data[0]; + dst += (height - 1) * f->linesize[0]; + for (i = height; i; i--) { + memcpy(dst, src, linelen); + src += linelen; + dst -= f->linesize[0]; + } +} + +static void add_frame_default(AVFrame *f, uint8_t *src, + int linelen, int height) { + int i, j; + uint8_t *dst = f->data[0]; + dst += (height - 1) * f->linesize[0]; + for (i = height; i; i--) { + for (j = linelen; j; j--) + *dst++ += *src++; + dst -= f->linesize[0] + linelen; + } +} + +#ifndef WORDS_BIGENDIAN +#define copy_frame_16 copy_frame_default +#define copy_frame_32 copy_frame_default +#define add_frame_16 add_frame_default +#define add_frame_32 add_frame_default +#else +static void copy_frame_16(AVFrame *f, uint8_t *src, + int linelen, int height) { + int i, j; + uint8_t *dst = f->data[0]; + dst += (height - 1) * f->linesize[0]; + for (i = height; i; i--) { + for (j = linelen / 2; j; j--) { + dst[0] = src[1]; + dst[1] = src[0]; + src += 2; + dst += 2; + } + dst -= f->linesize[0] + linelen; + } +} + +static void copy_frame_32(AVFrame *f, uint8_t *src, + int linelen, int height) { + int i, j; + uint8_t *dst = f->data[0]; + dst += (height - 1) * f->linesize[0]; + for (i = height; i; i--) { + for (j = linelen / 4; j; j--) { + dst[0] = src[3]; + dst[1] = src[2]; + dst[2] = src[1]; + dst[3] = src[0]; + src += 4; + dst += 4; + } + dst -= f->linesize[0] + linelen; + } +} + +static void add_frame_16(AVFrame *f, uint8_t *src, + int linelen, int height) { + int i, j; + uint8_t *dst = f->data[0]; + dst += (height - 1) * f->linesize[0]; + for (i = height; i; i--) { + for (j = linelen / 2; j; j--) { + dst[0] += src[1]; + dst[1] += src[0]; + src += 2; + dst += 2; + } + dst -= f->linesize[0] + linelen; + } +} + +static void add_frame_32(AVFrame *f, uint8_t *src, + int linelen, int height) { + int i, j; + uint8_t *dst = f->data[0]; + dst += (height - 1) * f->linesize[0]; + for (i = height; i; i--) { + for (j = linelen / 4; j; j--) { + dst[0] += src[3]; + dst[1] += src[2]; + dst[2] += src[1]; + dst[3] += src[0]; + src += 4; + dst += 4; + } + dst -= f->linesize[0] + linelen; + } +} +#endif + +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_safe(&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 + c->pic.pict_type = FF_I_TYPE; + c->pic.key_frame = 1; + switch (c->bpp) { + case 16: + copy_frame_16(&c->pic, c->decomp_buf, c->linelen, c->height); + break; + case 32: + copy_frame_32(&c->pic, c->decomp_buf, c->linelen, c->height); + break; + default: + copy_frame_default(&c->pic, c->decomp_buf, c->linelen, c->height); + } + } else { + c->pic.pict_type = FF_P_TYPE; + c->pic.key_frame = 0; + switch (c->bpp) { + case 16: + add_frame_16(&c->pic, c->decomp_buf, c->linelen, c->height); + break; + case 32: + add_frame_32(&c->pic, c->decomp_buf, c->linelen, c->height); + break; + default: + add_frame_default(&c->pic, c->decomp_buf, c->linelen, c->height); + } + } + + *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->bpp = avctx->bits_per_sample; + 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, +}; + diff --git a/libavformat/avienc.c b/libavformat/avienc.c index c495b4acb..774dfd9d5 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -193,6 +193,7 @@ const CodecTag codec_bmp_tags[] = { { 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 }, };