comparison flashsv.c @ 4367:b885917fbfef libavcodec

Get rid of #ifdef CONFIG_ZLIB in the code. Code cleanup.

4366:f8753597422c

 * block sizes should give a better result then to just use a fixed size.
 */

#include <stdio.h>
#include <stdlib.h>

#include "common.h"
#include "avcodec.h"
#include "bitstream.h"

#ifdef CONFIG_ZLIB
#include <zlib.h>
#endif

typedef struct FlashSVContext {
    AVCodecContext *avctx;
    AVFrame frame;
    int image_width, image_height;
    int block_width, block_height;
    uint8_t* tmpblock;
    int block_size;
#ifdef CONFIG_ZLIB
    z_stream zstream;
#endif
} FlashSVContext;


static void copy_region(uint8_t *sptr, uint8_t *dptr,
        int dx, int dy, int h, int w, int stride)

{
    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
    int zret; // Zlib return code

    s->avctx = avctx;
#ifdef CONFIG_ZLIB
    s->zstream.zalloc = Z_NULL;
    s->zstream.zfree = Z_NULL;
    s->zstream.opaque = Z_NULL;
    zret = inflateInit(&(s->zstream));
    if (zret != Z_OK) {
        av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
        return 1;
    }
#else
    av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled. Needed for the decoder.\n");
    return 1;
#endif
    avctx->pix_fmt = PIX_FMT_BGR24;
    avctx->has_b_frames = 0;
    s->frame.data[0] = NULL;

    return 0;

            if (size == 0) {
                /* no change, don't do anything */
            } else {
                /* decompress block */
#ifdef CONFIG_ZLIB
                int ret = inflateReset(&(s->zstream));
                if (ret != Z_OK)
                {
                    av_log(avctx, AV_LOG_ERROR, "error in decompression (reset) of block %dx%d\n", i, j);
                    /* return -1; */

                if ((ret != Z_OK) && (ret != Z_STREAM_END))
                {
                    av_log(avctx, AV_LOG_ERROR, "error in decompression of block %dx%d: %d\n", i, j, ret);
                    /* return -1; */
                }
#else
                av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled in.\n");
                return -1;
#endif
                copy_region(s->tmpblock, s->frame.data[0], s->image_height-(hp+hs+1), wp, hs, ws, s->frame.linesize[0]);
                skip_bits(&gb, 8*size);   /* skip the consumed bits */
            }
        }
    }

static int flashsv_decode_end(AVCodecContext *avctx)
{
    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
#ifdef CONFIG_ZLIB
    inflateEnd(&(s->zstream));
#endif
    /* release the frame if needed */
    if (s->frame.data[0])
        avctx->release_buffer(avctx, &s->frame);

    /* free the tmpblock */

4367:b885917fbfef

 * block sizes should give a better result then to just use a fixed size.
 */

#include <stdio.h>
#include <stdlib.h>
#include <zlib.h>

#include "common.h"
#include "avcodec.h"
#include "bitstream.h"

typedef struct FlashSVContext {
    AVCodecContext *avctx;
    AVFrame frame;
    int image_width, image_height;
    int block_width, block_height;
    uint8_t* tmpblock;
    int block_size;
    z_stream zstream;
} FlashSVContext;


static void copy_region(uint8_t *sptr, uint8_t *dptr,
        int dx, int dy, int h, int w, int stride)

{
    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
    int zret; // Zlib return code

    s->avctx = avctx;
    s->zstream.zalloc = Z_NULL;
    s->zstream.zfree = Z_NULL;
    s->zstream.opaque = Z_NULL;
    zret = inflateInit(&(s->zstream));
    if (zret != Z_OK) {
        av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
        return 1;
    }
    avctx->pix_fmt = PIX_FMT_BGR24;
    avctx->has_b_frames = 0;
    s->frame.data[0] = NULL;

    return 0;

            if (size == 0) {
                /* no change, don't do anything */
            } else {
                /* decompress block */
                int ret = inflateReset(&(s->zstream));
                if (ret != Z_OK)
                {
                    av_log(avctx, AV_LOG_ERROR, "error in decompression (reset) of block %dx%d\n", i, j);
                    /* return -1; */

                if ((ret != Z_OK) && (ret != Z_STREAM_END))
                {
                    av_log(avctx, AV_LOG_ERROR, "error in decompression of block %dx%d: %d\n", i, j, ret);
                    /* return -1; */
                }
                copy_region(s->tmpblock, s->frame.data[0], s->image_height-(hp+hs+1), wp, hs, ws, s->frame.linesize[0]);
                skip_bits(&gb, 8*size);   /* skip the consumed bits */
            }
        }
    }

static int flashsv_decode_end(AVCodecContext *avctx)
{
    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
    inflateEnd(&(s->zstream));
    /* release the frame if needed */
    if (s->frame.data[0])
        avctx->release_buffer(avctx, &s->frame);

    /* free the tmpblock */