comparison ivi_common.h @ 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

typedef struct {
    int32_t     num_rows;
    uint8_t     xbits[16];
} IVIHuffDesc;

extern const IVIHuffDesc ff_ivi_mb_huff_desc[8];  ///< static macroblock huffman tables
extern const IVIHuffDesc ff_ivi_blk_huff_desc[8]; ///< static block huffman tables


/**
 *  run-value (RLE) table descriptor
 */

 *  @return     result code: 0 - OK, -1 = error (invalid codebook descriptor)
 */
int  ff_ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag);

/**
 *  Decodes a huffman codebook descriptor from the bitstream.
 *
 *  @param gb   [in,out] the GetBit context
 *  @param desc [out] ptr to descriptor to be filled with data
 *  @return     selector indicating huffman table:

11246:b75449aaea3e

typedef struct {
    int32_t     num_rows;
    uint8_t     xbits[16];
} IVIHuffDesc;

extern VLC ff_ivi_mb_vlc_tabs [8]; ///< static macroblock Huffman tables
extern VLC ff_ivi_blk_vlc_tabs[8]; ///< static block Huffman tables


/**
 *  run-value (RLE) table descriptor
 */

 *  @return     result code: 0 - OK, -1 = error (invalid codebook descriptor)
 */
int  ff_ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag);

/**
 * Initializes static codes used for macroblock and block decoding.
 */
void ff_ivi_init_static_vlc();

/**
 *  Decodes a huffman codebook descriptor from the bitstream.
 *
 *  @param gb   [in,out] the GetBit context
 *  @param desc [out] ptr to descriptor to be filled with data
 *  @return     selector indicating huffman table: