X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftscc.c;h=b00b5c5568dc9cce9b22c43a11fbb99b3fa306d0;hb=e38215f2a4231af102a19a0e36e6c753b9318ef1;hp=0e97ee6d92da1a3e1eb550a8ff74551856535182;hpb=229daca7a276b734db53065d2a5af9ce8b046db4;p=ffmpeg diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 0e97ee6d92d..b00b5c5568d 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -2,24 +2,25 @@ * TechSmith Camtasia decoder * Copyright (c) 2004 Konstantin Shishkov * - * This library is free software; you can redistribute it and/or + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file tscc.c + * @file libavcodec/tscc.c * TechSmith Camtasia decoder * * Fourcc: TSCC @@ -37,12 +38,10 @@ #include #include -#include "common.h" #include "avcodec.h" +#include "msrledec.h" -#ifdef CONFIG_ZLIB #include -#endif /* @@ -60,105 +59,24 @@ typedef struct TsccContext { // Decompression buffer unsigned char* decomp_buf; int height; -#ifdef CONFIG_ZLIB z_stream zstream; -#endif } CamtasiaContext; -/* - * - * Decode RLE - almost identical to Windows BMP RLE8 - * and enhanced to bigger color depths - * - */ - -static int decode_rle(CamtasiaContext *c) -{ - unsigned char *src = c->decomp_buf; - unsigned char *output; - int p1, p2, line=c->height, pos=0, i; - - output = c->pic.data[0] + (c->height - 1) * c->pic.linesize[0]; - while(src < c->decomp_buf + c->decomp_size) { - p1 = *src++; - if(p1 == 0) { //Escape code - p2 = *src++; - if(p2 == 0) { //End-of-line - output = c->pic.data[0] + (--line) * c->pic.linesize[0]; - pos = 0; - continue; - } else if(p2 == 1) { //End-of-picture - return 0; - } else if(p2 == 2) { //Skip - p1 = *src++; - p2 = *src++; - line -= p2; - pos += p1; - output = c->pic.data[0] + line * c->pic.linesize[0] + pos * (c->bpp / 8); - continue; - } - // Copy data - for(i = 0; i < p2 * (c->bpp / 8); i++) { - *output++ = *src++; - } - // RLE8 copy is actually padded - and runs are not! - if(c->bpp == 8 && (p2 & 1)) { - src++; - } - pos += p2; - } else { //Run of pixels - int pix[3]; //original pixel - switch(c->bpp){ - case 8: pix[0] = *src++; - break; - case 16: pix[0] = *src++; - pix[1] = *src++; - break; - case 24: pix[0] = *src++; - pix[1] = *src++; - pix[2] = *src++; - break; - } - for(i = 0; i < p1; i++) { - switch(c->bpp){ - case 8: *output++ = pix[0]; - break; - case 16: *output++ = pix[0]; - *output++ = pix[1]; - break; - case 24: *output++ = pix[0]; - *output++ = pix[1]; - *output++ = pix[2]; - break; - } - } - pos += p1; - } - } - - av_log(c->avctx, AV_LOG_ERROR, "Camtasia warning: no End-of-picture code\n"); - return 1; -} - /* * * Decode a frame * */ -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { - CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data; - unsigned char *encoded = (unsigned char *)buf; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + CamtasiaContext * const c = avctx->priv_data; + const unsigned char *encoded = buf; unsigned char *outptr; -#ifdef CONFIG_ZLIB int zret; // Zlib return code -#endif int len = buf_size; - /* no supplementary picture */ - if (buf_size == 0) - return 0; - if(c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); @@ -171,7 +89,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 outptr = c->pic.data[0]; // Output image pointer -#ifdef CONFIG_ZLIB zret = inflateReset(&(c->zstream)); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); @@ -187,11 +104,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret); return -1; } - encoded = c->decomp_buf; - len = c->decomp_size; + + if(zret != Z_DATA_ERROR) - decode_rle(c); - + ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, c->decomp_buf, c->zstream.avail_out); + /* make the palette available on the way out */ if (c->avctx->pix_fmt == PIX_FMT_PAL8) { memcpy(c->pic.data[1], c->avctx->palctrl->palette, AVPALETTE_SIZE); @@ -201,11 +118,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 } } -#else - av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n"); - return -1; -#endif - *data_size = sizeof(AVFrame); *(AVFrame*)data = c->pic; @@ -220,34 +132,28 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 * Init tscc decoder * */ -static int decode_init(AVCodecContext *avctx) +static av_cold int decode_init(AVCodecContext *avctx) { - CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data; + CamtasiaContext * const c = avctx->priv_data; int zret; // Zlib return code c->avctx = avctx; - avctx->has_b_frames = 0; - c->pic.data[0] = NULL; c->height = avctx->height; -#ifdef CONFIG_ZLIB // Needed if zlib unused or init aborted before inflateInit - memset(&(c->zstream), 0, sizeof(z_stream)); -#else - av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n"); - return 1; -#endif - switch(avctx->bits_per_sample){ + memset(&(c->zstream), 0, sizeof(z_stream)); + switch(avctx->bits_per_coded_sample){ case 8: avctx->pix_fmt = PIX_FMT_PAL8; break; case 16: avctx->pix_fmt = PIX_FMT_RGB555; break; - case 24: av_log(avctx, AV_LOG_ERROR, "Camtasia warning: RGB24 is just guessed\n"); + case 24: avctx->pix_fmt = PIX_FMT_BGR24; break; - default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_sample); - return -1; + case 32: avctx->pix_fmt = PIX_FMT_RGB32; break; + default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_coded_sample); + return -1; } - c->bpp = avctx->bits_per_sample; + c->bpp = avctx->bits_per_coded_sample; c->decomp_size = (avctx->width * c->bpp + (avctx->width + 254) / 255 + 2) * avctx->height + 2;//RLE in the 'best' case /* Allocate decompression buffer */ @@ -257,8 +163,7 @@ static int decode_init(AVCodecContext *avctx) return 1; } } - -#ifdef CONFIG_ZLIB + c->zstream.zalloc = Z_NULL; c->zstream.zfree = Z_NULL; c->zstream.opaque = Z_NULL; @@ -267,7 +172,6 @@ static int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return 1; } -#endif return 0; } @@ -279,15 +183,15 @@ static int decode_init(AVCodecContext *avctx) * Uninit tscc decoder * */ -static int decode_end(AVCodecContext *avctx) +static av_cold int decode_end(AVCodecContext *avctx) { - CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data; + CamtasiaContext * const c = avctx->priv_data; + + av_freep(&c->decomp_buf); if (c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); -#ifdef CONFIG_ZLIB inflateEnd(&(c->zstream)); -#endif return 0; } @@ -302,5 +206,6 @@ AVCodec tscc_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), };