[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec cscd.c, NONE, 1.1 Makefile, 1.218, 1.219 allcodecs.c, 1.122, 1.123 avcodec.h, 1.440, 1.441
Reimar Döffinger CVS
reimar
Mon Jan 9 16:41:42 CET 2006
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv18276/libavcodec
Modified Files:
Makefile allcodecs.c avcodec.h
Added Files:
cscd.c
Log Message:
CamStudio decoder, only 32 bit lzo mode is tested
--- NEW FILE: cscd.c ---
/*
* 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, 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,
};
Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- Makefile 8 Jan 2006 14:53:37 -0000 1.218
+++ Makefile 9 Jan 2006 15:41:39 -0000 1.219
@@ -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: allcodecs.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- allcodecs.c 6 Jan 2006 13:18:31 -0000 1.122
+++ allcodecs.c 9 Jan 2006 15:41:39 -0000 1.123
@@ -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: avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -d -r1.440 -r1.441
--- avcodec.h 4 Jan 2006 16:31:23 -0000 1.440
+++ avcodec.h 9 Jan 2006 15:41:39 -0000 1.441
@@ -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;
More information about the ffmpeg-cvslog
mailing list