X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fzmbv.c;h=10fd903b981e23a43d4f57c67c91b61b1ee9a16b;hb=dad09ff93f5df1ec987493f404d43cd16991e992;hp=89b8418c55974444bbbfba344a45a43705287106;hpb=9ac421e3c101d3b2b0a0e5114c211b6d72459bb2;p=ffmpeg diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 89b8418c559..10fd903b981 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -2,38 +2,35 @@ * Zip Motion Blocks Video (ZMBV) decoder * Copyright (c) 2006 Konstantin Shishkov * - * 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 - * */ /** - * @file zmbv.c + * @file * Zip Motion Blocks Video decoder */ #include #include -#include "common.h" +#include "libavutil/intreadwrite.h" #include "avcodec.h" -#ifdef CONFIG_ZLIB #include -#endif #define ZMBV_KEYFRAME 1 #define ZMBV_DELTAPAL 2 @@ -68,9 +65,7 @@ typedef struct ZmbvContext { int flags; int bw, bh, bx, by; int decomp_len; -#ifdef CONFIG_ZLIB z_stream zstream; -#endif int (*decode_intra)(struct ZmbvContext *c); int (*decode_xor)(struct ZmbvContext *c); } ZmbvContext; @@ -147,7 +142,7 @@ static int zmbv_decode_xor_8(ZmbvContext *c) prev += c->width * c->bh; } if(src - c->decomp_buf != c->decomp_len) - av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", src-c->decomp_buf, c->decomp_len); + av_log(c->avctx, AV_LOG_ERROR, "Used %ti of %i bytes\n", src-c->decomp_buf, c->decomp_len); return 0; } @@ -220,7 +215,7 @@ static int zmbv_decode_xor_16(ZmbvContext *c) prev += c->width * c->bh; } if(src - c->decomp_buf != c->decomp_len) - av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", src-c->decomp_buf, c->decomp_len); + av_log(c->avctx, AV_LOG_ERROR, "Used %ti of %i bytes\n", src-c->decomp_buf, c->decomp_len); return 0; } @@ -376,7 +371,7 @@ static int zmbv_decode_xor_32(ZmbvContext *c) prev += c->width * c->bh; } if(src - c->decomp_buf != c->decomp_len) - av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", src-c->decomp_buf, c->decomp_len); + av_log(c->avctx, AV_LOG_ERROR, "Used %ti of %i bytes\n", src-c->decomp_buf, c->decomp_len); return 0; } @@ -397,13 +392,12 @@ static int zmbv_decode_intra(ZmbvContext *c) return 0; } -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) { - ZmbvContext * const c = (ZmbvContext *)avctx->priv_data; - uint8_t *outptr; -#ifdef CONFIG_ZLIB + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + ZmbvContext * const c = avctx->priv_data; int zret = Z_OK; // Zlib return code -#endif int len = buf_size; int hi_ver, lo_ver; @@ -417,8 +411,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 return -1; } - outptr = c->pic.data[0]; // Output image pointer - /* parse header */ c->flags = buf[0]; buf++; len--; @@ -439,6 +431,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 } if(c->bw == 0 || c->bh == 0) { av_log(avctx, AV_LOG_ERROR, "Unsupported block size %ix%i\n", c->bw, c->bh); + return -1; } if(c->comp != 0 && c->comp != 1) { av_log(avctx, AV_LOG_ERROR, "Unsupported compression type %i\n", c->comp); @@ -475,16 +468,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 av_log(avctx, AV_LOG_ERROR, "Unsupported (for now) format %i\n", c->fmt); return -1; } -#ifdef CONFIG_ZLIB + zret = inflateReset(&c->zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); return -1; } -#else - av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n"); - return -1; -#endif /* CONFIG_ZLIB */ + c->cur = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8)); c->prev = av_realloc(c->prev, avctx->width * avctx->height * (c->bpp / 8)); c->bx = (c->width + c->bw - 1) / c->bw; @@ -500,7 +490,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 memcpy(c->decomp_buf, buf, len); c->decomp_size = 1; } else { // ZLIB-compressed data -#ifdef CONFIG_ZLIB c->zstream.total_in = c->zstream.total_out = 0; c->zstream.next_in = buf; c->zstream.avail_in = len; @@ -508,19 +497,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 c->zstream.avail_out = c->decomp_size; inflate(&c->zstream, Z_FINISH); c->decomp_len = c->zstream.total_out; -#else - av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n"); - return -1; -#endif } if(c->flags & ZMBV_KEYFRAME) { c->pic.key_frame = 1; - c->pic.pict_type = FF_I_TYPE; + c->pic.pict_type = AV_PICTURE_TYPE_I; c->decode_intra(c); } else { c->pic.key_frame = 0; - c->pic.pict_type = FF_P_TYPE; - c->decode_xor(c); + c->pic.pict_type = AV_PICTURE_TYPE_P; + if(c->decomp_len) + c->decode_xor(c); } /* update frames */ @@ -537,7 +523,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 out[i * 3 + 0] = c->pal[(*src) * 3 + 0]; out[i * 3 + 1] = c->pal[(*src) * 3 + 1]; out[i * 3 + 2] = c->pal[(*src) * 3 + 2]; - *src++; + src++; } out += c->pic.linesize[0]; } @@ -580,9 +566,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 for(i = 0; i < c->width; i++) { uint32_t tmp = AV_RL32(src); src += 4; - out[i * 3 + 0] = tmp >> 16; - out[i * 3 + 1] = tmp >> 8; - out[i * 3 + 2] = tmp >> 0; + AV_WB24(out+(i*3), tmp); } out += c->pic.linesize[0]; } @@ -606,29 +590,21 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 * Init zmbv decoder * */ -static int decode_init(AVCodecContext *avctx) +static av_cold int decode_init(AVCodecContext *avctx) { - ZmbvContext * const c = (ZmbvContext *)avctx->priv_data; + ZmbvContext * const c = avctx->priv_data; int zret; // Zlib return code c->avctx = avctx; - c->pic.data[0] = NULL; c->width = avctx->width; c->height = avctx->height; - if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { - return 1; - } - c->bpp = avctx->bits_per_sample; + c->bpp = avctx->bits_per_coded_sample; -#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 + avctx->pix_fmt = PIX_FMT_RGB24; c->decomp_size = (avctx->width + 255) * 4 * (avctx->height + 64); @@ -640,7 +616,6 @@ static int decode_init(AVCodecContext *avctx) } } -#ifdef CONFIG_ZLIB c->zstream.zalloc = Z_NULL; c->zstream.zfree = Z_NULL; c->zstream.opaque = Z_NULL; @@ -649,7 +624,6 @@ static int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return 1; } -#endif return 0; } @@ -661,31 +635,30 @@ static int decode_init(AVCodecContext *avctx) * Uninit zmbv decoder * */ -static int decode_end(AVCodecContext *avctx) +static av_cold int decode_end(AVCodecContext *avctx) { - ZmbvContext * const c = (ZmbvContext *)avctx->priv_data; + ZmbvContext * 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 av_freep(&c->cur); av_freep(&c->prev); return 0; } -AVCodec zmbv_decoder = { - "zmbv", - CODEC_TYPE_VIDEO, - CODEC_ID_ZMBV, - sizeof(ZmbvContext), - decode_init, - NULL, - decode_end, - decode_frame +AVCodec ff_zmbv_decoder = { + .name = "zmbv", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_ZMBV, + .priv_data_size = sizeof(ZmbvContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), };