comparison lcldec.c @ 9770:e883c3dab3ec libavcodec

Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression.

9769:6efef56e20b3

#include <stdlib.h>

#include "avcodec.h"
#include "bytestream.h"
#include "lcl.h"

#if CONFIG_ZLIB_DECODER
#include <zlib.h>
#endif

} LclDecContext;


/**
 * \param srcptr compressed source buffer, must be padded with at least 4 extra bytes
 */
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;

            ofs &= 0x7ff;
            cnt *= 4;
            if (destptr_end - destptr < cnt) {
                cnt =  destptr_end - destptr;
            }
            for (; cnt > 0; cnt--) {
                *destptr = *(destptr - ofs);
                destptr++;
            }
        }
    }

    return destptr - destptr_bak;
}

 */
static av_cold int decode_init(AVCodecContext *avctx)
{
    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_decomp_size;

    c->pic.data[0] = NULL;

#if CONFIG_ZLIB_DECODER

9770:e883c3dab3ec

#include <stdlib.h>

#include "avcodec.h"
#include "bytestream.h"
#include "lcl.h"
#include "libavutil/lzo.h"

#if CONFIG_ZLIB_DECODER
#include <zlib.h>
#endif

} LclDecContext;


/**
 * \param srcptr compressed source buffer, must be padded with at least 4 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;

            ofs &= 0x7ff;
            cnt *= 4;
            if (destptr_end - destptr < cnt) {
                cnt =  destptr_end - destptr;
            }
            av_memcpy_backptr(destptr, ofs, cnt);
            destptr += cnt;
        }
    }

    return destptr - destptr_bak;
}

 */
static av_cold int decode_init(AVCodecContext *avctx)
{
    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) + AV_LZO_OUTPUT_PADDING;
    unsigned int max_decomp_size;

    c->pic.data[0] = NULL;

#if CONFIG_ZLIB_DECODER