comparison indeo5.c @ 11246:b75449aaea3e libavcodec

Macroblock and block Huffman code sets are to be used by both Indeo 4 and Indeo 5, so make them global and move their initialization to the common place as well. And fix static VLC initialization, as ff_ivi_create_huff_from_desc() used old way to do so.

11245:1e9ff636c3db

    int             is_scalable;
    uint32_t        lock_word;
    IVIPicConfig    pic_conf;
} IVI5DecContext;

//! static vlc tables (initialized at startup)
static VLC mb_vlc_tabs [8];
static VLC blk_vlc_tabs[8];


/**
 *  Decodes Indeo5 GOP (Group of pictures) header.
 *  This header is present in key frames only.
 *  It defines parameters for all frames in a GOP.

        /* decode macroblock huffman codebook */
        if (ctx->frame_flags & 0x40) {
            ctx->mb_huff_sel = ff_ivi_dec_huff_desc(&ctx->gb, &new_huff);
            if (ctx->mb_huff_sel != 7) {
                ctx->mb_vlc = &mb_vlc_tabs[ctx->mb_huff_sel];
            } else {
                if (ff_ivi_huff_desc_cmp(&new_huff, &ctx->mb_huff_desc)) {
                    ff_ivi_huff_desc_copy(&ctx->mb_huff_desc, &new_huff);

                    if (ctx->mb_vlc_cust.table)

                    }
                }
                ctx->mb_vlc = &ctx->mb_vlc_cust;
            }
        } else {
            ctx->mb_vlc = &mb_vlc_tabs[7]; /* select the default macroblock huffman table */
        }

        skip_bits(&ctx->gb, 3); /* FIXME: unknown meaning! */
    }

    /* decode block huffman codebook */
    if (band_flags & 0x80) {
        band->huff_sel = ff_ivi_dec_huff_desc(&ctx->gb, &new_huff);
        if (band->huff_sel != 7) {
            band->blk_vlc = &blk_vlc_tabs[band->huff_sel];
        } else {
            if (ff_ivi_huff_desc_cmp(&new_huff, &band->huff_desc)) {
                ff_ivi_huff_desc_copy(&band->huff_desc, &new_huff);

                if (band->blk_vlc_cust.table)

                }
            }
            band->blk_vlc = &band->blk_vlc_cust;
        }
    } else {
        band->blk_vlc = &blk_vlc_tabs[7]; /* select the default macroblock huffman table */
    }

    band->checksum_present = get_bits1(&ctx->gb);
    if (band->checksum_present)
        band->checksum = get_bits(&ctx->gb, 16);

 *  Initializes Indeo5 decoder.
 */
static av_cold int decode_init(AVCodecContext *avctx)
{
    IVI5DecContext  *ctx = avctx->priv_data;
    int             i, result;

    /* initialize static vlc tables for macroblock/block signals */
    for (i = 0; i < 8; i++) {
        ff_ivi_create_huff_from_desc(&ff_ivi_mb_huff_desc[i],  &mb_vlc_tabs[i],  1);
        ff_ivi_create_huff_from_desc(&ff_ivi_blk_huff_desc[i], &blk_vlc_tabs[i], 1);
    }

    /* copy rvmap tables in our context so we can apply changes to them */
    memcpy(ctx->rvmap_tabs, ff_ivi_rvmap_tabs, sizeof(ff_ivi_rvmap_tabs));

    /* set the initial picture layout according to the basic profile:

11246:b75449aaea3e

    int             is_scalable;
    uint32_t        lock_word;
    IVIPicConfig    pic_conf;
} IVI5DecContext;


/**
 *  Decodes Indeo5 GOP (Group of pictures) header.
 *  This header is present in key frames only.
 *  It defines parameters for all frames in a GOP.

        /* decode macroblock huffman codebook */
        if (ctx->frame_flags & 0x40) {
            ctx->mb_huff_sel = ff_ivi_dec_huff_desc(&ctx->gb, &new_huff);
            if (ctx->mb_huff_sel != 7) {
                ctx->mb_vlc = &ff_ivi_mb_vlc_tabs[ctx->mb_huff_sel];
            } else {
                if (ff_ivi_huff_desc_cmp(&new_huff, &ctx->mb_huff_desc)) {
                    ff_ivi_huff_desc_copy(&ctx->mb_huff_desc, &new_huff);

                    if (ctx->mb_vlc_cust.table)

                    }
                }
                ctx->mb_vlc = &ctx->mb_vlc_cust;
            }
        } else {
            ctx->mb_vlc = &ff_ivi_mb_vlc_tabs[7]; /* select the default macroblock huffman table */
        }

        skip_bits(&ctx->gb, 3); /* FIXME: unknown meaning! */
    }

    /* decode block huffman codebook */
    if (band_flags & 0x80) {
        band->huff_sel = ff_ivi_dec_huff_desc(&ctx->gb, &new_huff);
        if (band->huff_sel != 7) {
            band->blk_vlc = &ff_ivi_blk_vlc_tabs[band->huff_sel];
        } else {
            if (ff_ivi_huff_desc_cmp(&new_huff, &band->huff_desc)) {
                ff_ivi_huff_desc_copy(&band->huff_desc, &new_huff);

                if (band->blk_vlc_cust.table)

                }
            }
            band->blk_vlc = &band->blk_vlc_cust;
        }
    } else {
        band->blk_vlc = &ff_ivi_blk_vlc_tabs[7]; /* select the default macroblock huffman table */
    }

    band->checksum_present = get_bits1(&ctx->gb);
    if (band->checksum_present)
        band->checksum = get_bits(&ctx->gb, 16);

 *  Initializes Indeo5 decoder.
 */
static av_cold int decode_init(AVCodecContext *avctx)
{
    IVI5DecContext  *ctx = avctx->priv_data;
    int             result;

    ff_ivi_init_static_vlc();

    /* copy rvmap tables in our context so we can apply changes to them */
    memcpy(ctx->rvmap_tabs, ff_ivi_rvmap_tabs, sizeof(ff_ivi_rvmap_tabs));

    /* set the initial picture layout according to the basic profile: