X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftscc.c;h=7c5447322859360e63a64459b4cf73c2b2771c23;hb=0c9c4004ed57de210b4d83c7b39bbfb00b86b9af;hp=90d203dd77e7e9a86fa7ae5daaae123192952ab6;hpb=da9cea77e314dad2fbc615a76085a0c330741f92;p=ffmpeg diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 90d203dd77e..7c544732285 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -32,25 +32,20 @@ * then this coded picture is packed with ZLib * * Supports: BGR8,BGR555,BGR24 - only BGR8 and BGR555 tested - * */ #include #include #include "avcodec.h" +#include "internal.h" #include "msrledec.h" #include - -/* - * Decoder context - */ typedef struct TsccContext { AVCodecContext *avctx; - AVFrame pic; // Bits per pixel int bpp; @@ -58,81 +53,67 @@ typedef struct TsccContext { unsigned int decomp_size; // Decompression buffer unsigned char* decomp_buf; + GetByteContext gb; int height; z_stream zstream; uint32_t pal[256]; } CamtasiaContext; -/* - * - * Decode a frame - * - */ -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) +static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; CamtasiaContext * const c = avctx->priv_data; - const unsigned char *encoded = buf; - int zret; // Zlib return code - int len = buf_size; + AVFrame *frame = data; + int ret; - if(c->pic.data[0]) - avctx->release_buffer(avctx, &c->pic); - - c->pic.reference = 1; - c->pic.buffer_hints = FF_BUFFER_HINTS_VALID; - if(avctx->get_buffer(avctx, &c->pic) < 0){ + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0){ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } - zret = inflateReset(&(c->zstream)); - if (zret != Z_OK) { - av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); - return -1; + ret = inflateReset(&c->zstream); + if (ret != Z_OK) { + av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret); + return AVERROR_UNKNOWN; } - c->zstream.next_in = encoded; - c->zstream.avail_in = len; + c->zstream.next_in = buf; + c->zstream.avail_in = buf_size; c->zstream.next_out = c->decomp_buf; c->zstream.avail_out = c->decomp_size; - zret = inflate(&(c->zstream), Z_FINISH); + ret = inflate(&c->zstream, Z_FINISH); // Z_DATA_ERROR means empty picture - if ((zret != Z_OK) && (zret != Z_STREAM_END) && (zret != Z_DATA_ERROR)) { - av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret); - return -1; + if ((ret != Z_OK) && (ret != Z_STREAM_END) && (ret != Z_DATA_ERROR)) { + av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", ret); + return AVERROR_UNKNOWN; } - if(zret != Z_DATA_ERROR) - ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, c->decomp_buf, c->decomp_size - c->zstream.avail_out); + if (ret != Z_DATA_ERROR) { + bytestream2_init(&c->gb, c->decomp_buf, + c->decomp_size - c->zstream.avail_out); + ff_msrle_decode(avctx, frame, c->bpp, &c->gb); + } /* make the palette available on the way out */ - if (c->avctx->pix_fmt == PIX_FMT_PAL8) { + if (c->avctx->pix_fmt == AV_PIX_FMT_PAL8) { const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); if (pal) { - c->pic.palette_has_changed = 1; + frame->palette_has_changed = 1; memcpy(c->pal, pal, AVPALETTE_SIZE); } - memcpy(c->pic.data[1], c->pal, AVPALETTE_SIZE); + memcpy(frame->data[1], c->pal, AVPALETTE_SIZE); } - *data_size = sizeof(AVFrame); - *(AVFrame*)data = c->pic; + *got_frame = 1; /* always report that the buffer was completely consumed */ return buf_size; } - - -/* - * - * Init tscc decoder - * - */ static av_cold int decode_init(AVCodecContext *avctx) { CamtasiaContext * const c = avctx->priv_data; @@ -143,16 +124,16 @@ static av_cold int decode_init(AVCodecContext *avctx) c->height = avctx->height; // Needed if zlib unused or init aborted before inflateInit - memset(&(c->zstream), 0, sizeof(z_stream)); + 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 8: avctx->pix_fmt = AV_PIX_FMT_PAL8; break; + case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555; break; case 24: - avctx->pix_fmt = PIX_FMT_BGR24; + avctx->pix_fmt = AV_PIX_FMT_BGR24; break; - case 32: avctx->pix_fmt = PIX_FMT_RGB32; break; + case 32: avctx->pix_fmt = AV_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; + return AVERROR_INVALIDDATA; } c->bpp = avctx->bits_per_coded_sample; // buffer size for RLE 'best' case when 2-byte code precedes each pixel and there may be padding after it too @@ -160,53 +141,43 @@ static av_cold int decode_init(AVCodecContext *avctx) /* Allocate decompression buffer */ if (c->decomp_size) { - if ((c->decomp_buf = av_malloc(c->decomp_size)) == NULL) { + if (!(c->decomp_buf = av_malloc(c->decomp_size))) { av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); - return 1; + return AVERROR(ENOMEM); } } c->zstream.zalloc = Z_NULL; c->zstream.zfree = Z_NULL; c->zstream.opaque = Z_NULL; - zret = inflateInit(&(c->zstream)); + zret = inflateInit(&c->zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); - return 1; + return AVERROR_UNKNOWN; } return 0; } - - -/* - * - * Uninit tscc decoder - * - */ static av_cold int decode_end(AVCodecContext *avctx) { CamtasiaContext * const c = avctx->priv_data; av_freep(&c->decomp_buf); - if (c->pic.data[0]) - avctx->release_buffer(avctx, &c->pic); - inflateEnd(&(c->zstream)); + inflateEnd(&c->zstream); return 0; } AVCodec ff_tscc_decoder = { .name = "camtasia", + .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_TSCC, + .id = AV_CODEC_ID_TSCC, .priv_data_size = sizeof(CamtasiaContext), .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), + .capabilities = AV_CODEC_CAP_DR1, }; -