X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcscd.c;h=6c84f03b4ab74210fe676725f7302450cf18f6a8;hb=c318626ce248e55df032146b16e8e0f4ed1d99fb;hp=e58cf7861d7ca4f0b79a2d52307a7eca28fe268c;hpb=63613fe615160671b394a232c1a3736319a6a8ec;p=ffmpeg diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index e58cf7861d7..6c84f03b4ab 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -2,20 +2,20 @@ * CamStudio decoder * Copyright (c) 2006 Reimar Doeffinger * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include @@ -35,19 +35,19 @@ typedef struct { unsigned char* decomp_buf; } CamStudioContext; -static void copy_frame_default(AVFrame *f, const uint8_t *src, +static void copy_frame_default(AVFrame *f, const uint8_t *src, int src_stride, 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; + src += src_stride; dst -= f->linesize[0]; } } -static void add_frame_default(AVFrame *f, const uint8_t *src, +static void add_frame_default(AVFrame *f, const uint8_t *src, int src_stride, int linelen, int height) { int i, j; uint8_t *dst = f->data[0]; @@ -55,15 +55,16 @@ static void add_frame_default(AVFrame *f, const uint8_t *src, for (i = height; i; i--) { for (j = linelen; j; j--) *dst++ += *src++; + src += src_stride - linelen; dst -= f->linesize[0] + linelen; } } #if !HAVE_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 +#define copy_frame_16(f, s, l, h) copy_frame_default(f, s, l, l, h) +#define copy_frame_32(f, s, l, h) copy_frame_default(f, s, l, l, h) +#define add_frame_16(f, s, l, h) add_frame_default(f, s, l, l, h) +#define add_frame_32(f, s, l, h) add_frame_default(f, s, l, l, h) #else static void copy_frame_16(AVFrame *f, const uint8_t *src, int linelen, int height) { @@ -182,7 +183,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, // flip upside down, add difference frame if (buf[0] & 1) { // keyframe - c->pic.pict_type = FF_I_TYPE; + c->pic.pict_type = AV_PICTURE_TYPE_I; c->pic.key_frame = 1; switch (c->bpp) { case 16: @@ -192,10 +193,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, 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); + copy_frame_default(&c->pic, c->decomp_buf, FFALIGN(c->linelen, 4), + c->linelen, c->height); } } else { - c->pic.pict_type = FF_P_TYPE; + c->pic.pict_type = AV_PICTURE_TYPE_P; c->pic.key_frame = 0; switch (c->bpp) { case 16: @@ -205,7 +207,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, 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); + add_frame_default(&c->pic, c->decomp_buf, FFALIGN(c->linelen, 4), + c->linelen, c->height); } } @@ -216,9 +219,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, static av_cold int decode_init(AVCodecContext *avctx) { CamStudioContext *c = avctx->priv_data; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { - return 1; - } + int stride; switch (avctx->bits_per_coded_sample) { case 16: avctx->pix_fmt = PIX_FMT_RGB555; break; case 24: avctx->pix_fmt = PIX_FMT_BGR24; break; @@ -227,17 +228,20 @@ static av_cold int decode_init(AVCodecContext *avctx) { av_log(avctx, AV_LOG_ERROR, "CamStudio codec error: invalid depth %i bpp\n", avctx->bits_per_coded_sample); - return 1; + return AVERROR_INVALIDDATA; } c->bpp = avctx->bits_per_coded_sample; c->pic.data[0] = NULL; c->linelen = avctx->width * avctx->bits_per_coded_sample / 8; c->height = avctx->height; - c->decomp_size = c->height * c->linelen; + stride = c->linelen; + if (avctx->bits_per_coded_sample == 24) + stride = FFALIGN(stride, 4); + c->decomp_size = c->height * stride; c->decomp_buf = av_malloc(c->decomp_size + AV_LZO_OUTPUT_PADDING); if (!c->decomp_buf) { av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); - return 1; + return AVERROR(ENOMEM); } return 0; } @@ -250,16 +254,14 @@ static av_cold int decode_end(AVCodecContext *avctx) { return 0; } -AVCodec cscd_decoder = { - "camstudio", - CODEC_TYPE_VIDEO, - CODEC_ID_CSCD, - sizeof(CamStudioContext), - decode_init, - NULL, - decode_end, - decode_frame, - CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), +AVCodec ff_cscd_decoder = { + .name = "camstudio", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_CSCD, + .priv_data_size = sizeof(CamStudioContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), }; -