*/
/**
- * @file libavcodec/lcldec.c
+ * @file
* LCL (LossLess Codec Library) Video Codec
* Decoder for MSZH and ZLIB codecs
* Experimental encoder for ZLIB RGB24
#include <stdlib.h>
#include "avcodec.h"
-#include "get_bits.h"
+#include "bytestream.h"
#include "lcl.h"
+#include "libavutil/lzo.h"
#if CONFIG_ZLIB_DECODER
#include <zlib.h>
} LclDecContext;
-static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned char * destptr, unsigned int destsize)
+/**
+ * \param srcptr compressed source buffer, must be padded with at least 5 extra bytes
+ * \param destptr must be padded sufficiently for av_memcpy_backptr
+ */
+static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsigned char * destptr, unsigned int destsize)
{
unsigned char *destptr_bak = destptr;
unsigned char *destptr_end = destptr + destsize;
- unsigned char mask = 0;
- unsigned char maskbit = 0;
- unsigned int ofs, cnt;
+ const unsigned char *srcptr_end = srcptr + srclen;
+ unsigned mask = *srcptr++;
+ unsigned maskbit = 0x80;
- while (srclen > 0 && destptr < destptr_end) {
- if (maskbit == 0) {
- mask = *srcptr++;
- maskbit = 8;
- srclen--;
- continue;
- }
- if ((mask & (1 << (--maskbit))) == 0) {
- if (destptr + 4 > destptr_end)
- break;
- AV_WN32(destptr, AV_RN32(srcptr));
- srclen -= 4;
+ while (srcptr < srcptr_end && destptr < destptr_end) {
+ if (!(mask & maskbit)) {
+ memcpy(destptr, srcptr, 4);
destptr += 4;
srcptr += 4;
} else {
- ofs = *srcptr++;
- cnt = *srcptr++;
- ofs += cnt * 256;
- cnt = ((cnt >> 3) & 0x1f) + 1;
+ unsigned ofs = bytestream_get_le16(&srcptr);
+ unsigned cnt = (ofs >> 11) + 1;
ofs &= 0x7ff;
- srclen -= 2;
+ ofs = FFMIN(ofs, destptr - destptr_bak);
cnt *= 4;
- if (destptr + cnt > destptr_end) {
- cnt = destptr_end - destptr;
- }
- for (; cnt > 0; cnt--) {
- *destptr = *(destptr - ofs);
- destptr++;
+ cnt = FFMIN(cnt, destptr_end - destptr);
+ av_memcpy_backptr(destptr, ofs, cnt);
+ destptr += cnt;
+ }
+ maskbit >>= 1;
+ if (!maskbit) {
+ mask = *srcptr++;
+ while (!mask) {
+ if (destptr_end - destptr < 32 || srcptr_end - srcptr < 32) break;
+ memcpy(destptr, srcptr, 32);
+ destptr += 32;
+ srcptr += 32;
+ mask = *srcptr++;
}
+ maskbit = 0x80;
}
}
}
+#if CONFIG_ZLIB_DECODER
/**
* \brief decompress a zlib-compressed data block into decomp_buf
* \param src compressed input buffer
}
return c->zstream.total_out;
}
+#endif
/*
switch (c->compression) {
case COMP_MSZH:
if (c->flags & FLAG_MULTITHREAD) {
- mthread_inlen = *(unsigned int*)encoded;
- mthread_outlen = *(unsigned int*)(encoded+4);
- if (mthread_outlen > c->decomp_size) // this should not happen
- mthread_outlen = c->decomp_size;
+ mthread_inlen = AV_RL32(encoded);
+ mthread_inlen = FFMIN(mthread_inlen, len - 8);
+ mthread_outlen = AV_RL32(encoded+4);
+ mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size);
if (mthread_outlen != mszh_dlen) {
av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n",
mthread_outlen, mszh_dlen);
return -1;
}
- mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - mthread_inlen,
+ mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - 8 - mthread_inlen,
c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen);
if (mthread_outlen != mszh_dlen) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n",
break;
if (c->flags & FLAG_MULTITHREAD) {
int ret;
- mthread_inlen = *(unsigned int*)encoded;
- mthread_outlen = *(unsigned int*)(encoded+4);
- if (mthread_outlen > c->decomp_size)
- mthread_outlen = c->decomp_size;
+ mthread_inlen = AV_RL32(encoded);
+ mthread_inlen = FFMIN(mthread_inlen, len - 8);
+ mthread_outlen = AV_RL32(encoded+4);
+ mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen);
if (ret < 0) return ret;
- ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - mthread_inlen,
+ ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - 8 - mthread_inlen,
mthread_outlen, mthread_outlen);
if (ret < 0) return ret;
} else {
{
LclDecContext * const c = avctx->priv_data;
unsigned int basesize = avctx->width * avctx->height;
- unsigned int max_basesize = FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4);
+ unsigned int max_basesize = FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4) + AV_LZO_OUTPUT_PADDING;
unsigned int max_decomp_size;
- c->pic.data[0] = NULL;
-
-#if CONFIG_ZLIB_DECODER
- // Needed if zlib unused or init aborted before inflateInit
- memset(&c->zstream, 0, sizeof(z_stream));
-#endif
-
if (avctx->extradata_size < 8) {
av_log(avctx, AV_LOG_ERROR, "Extradata size too small.\n");
return 1;
}
- if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
- return 1;
- }
-
/* Check codec type */
if ((avctx->codec_id == CODEC_ID_MSZH && avctx->extradata[7] != CODEC_MSZH) ||
(avctx->codec_id == CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) {
}
/* Detect compression method */
- c->compression = avctx->extradata[5];
+ c->compression = (int8_t)avctx->extradata[5];
switch (avctx->codec_id) {
case CODEC_ID_MSZH:
switch (c->compression) {
av_log(avctx, AV_LOG_DEBUG, "Multithread encoder flag set.\n");
if (c->flags & FLAG_NULLFRAME)
av_log(avctx, AV_LOG_DEBUG, "Nullframe insertion flag set.\n");
- if ((avctx->codec_id == CODEC_ID_ZLIB) && (c->flags & FLAG_PNGFILTER))
+ if (avctx->codec_id == CODEC_ID_ZLIB && (c->flags & FLAG_PNGFILTER))
av_log(avctx, AV_LOG_DEBUG, "PNG filter flag set.\n");
if (c->flags & FLAGMASK_UNUSED)
av_log(avctx, AV_LOG_ERROR, "Unknown flag set (%d).\n", c->flags);
zret = inflateInit(&c->zstream);
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
+ av_freep(&c->decomp_buf);
return 1;
}
}
{
LclDecContext * const c = avctx->priv_data;
+ av_freep(&c->decomp_buf);
if (c->pic.data[0])
avctx->release_buffer(avctx, &c->pic);
#if CONFIG_ZLIB_DECODER
- inflateEnd(&c->zstream);
+ if (avctx->codec_id == CODEC_ID_ZLIB)
+ inflateEnd(&c->zstream);
#endif
return 0;
#if CONFIG_MSZH_DECODER
AVCodec mszh_decoder = {
"mszh",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MSZH,
sizeof(LclDecContext),
decode_init,
#if CONFIG_ZLIB_DECODER
AVCodec zlib_decoder = {
"zlib",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_ZLIB,
sizeof(LclDecContext),
decode_init,