ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/ivi_common.h

 /*
  * common functions for Indeo Video Interactive codecs (Indeo4 and Indeo5)
  *
  * Copyright (c) 2009 Maxim Poliakovski
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 27 matching lines @@
 #define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes
 
 /**
  *  huffman codebook descriptor
  */
 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
+/**
+ *  macroblock/block huffman table descriptor
+ */
+typedef struct {
+    int32_t     tab_sel;    /// index of one of the predefined tables
+                            /// or "7" for custom one
+    VLC         *tab;       /// pointer to the table associated with tab_sel
+
+    //! the following are used only when tab_sel == 7
+    IVIHuffDesc cust_desc;  /// custom Huffman codebook descriptor
+    VLC         cust_tab;   /// vlc table for custom codebook
+} IVIHuffTab;
+
+enum {
+    IVI_MB_HUFF   = 0,      /// Huffman table is used for coding macroblocks
+    IVI_BLK_HUFF  = 1       /// Huffman table is used for coding blocks
+};
+
+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
  */
 typedef struct {
     uint8_t     eob_sym; ///< end of block symbol
     uint8_t     esc_sym; ///< escape symbol
     uint8_t     runtab[256];
     int8_t      valtab[256];
@@ skipping 51 matching lines @@
     int             mb_size;        ///< macroblock size
     int             blk_size;       ///< block size
     int             is_halfpel;     ///< precision of the motion compensation: 0 - fullpel, 1 - halfpel
     int             inherit_mv;     ///< tells if motion vector is inherited from reference macroblock
     int             inherit_qdelta; ///< tells if quantiser delta is inherited from reference macroblock
     int             qdelta_present; ///< tells if Qdelta signal is present in the bitstream (Indeo5 only)
     int             quant_mat;      ///< dequant matrix index
     int             glob_quant;     ///< quant base for this band
     const uint8_t   *scan;          ///< ptr to the scan pattern
 
-    int             huff_sel;       ///< huffman table for this band
-    IVIHuffDesc     huff_desc;      ///< table descriptor associated with the selector above
-    VLC             *blk_vlc;       ///< ptr to the vlc table for decoding block data
-    VLC             blk_vlc_cust;   ///< custom block vlc table
+    IVIHuffTab      blk_vlc;        ///< vlc table for decoding block data
 
     uint16_t        *dequant_intra; ///< ptr to dequant tables for intra blocks
     uint16_t        *dequant_inter; ///< ptr dequant tables for inter blocks
     int             num_corr;       ///< number of correction entries
     uint8_t         corr[61*2];     ///< rvmap correction pairs
     int             rvmap_sel;      ///< rvmap table selector
     RVMapDesc       *rv_map;        ///< ptr to the RLE table for this band
     int             num_tiles;      ///< number of tiles in this band
     IVITile         *tiles;         ///< array of tile descriptors
     void (*inv_transform)(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); ///< inverse transform function pointer
@@ skipping 41 matching lines @@
 }
 
 /** calculate number of tiles in a stride */
 #define IVI_NUM_TILES(stride, tile_size) (((stride) + (tile_size) - 1) / (tile_size))
 
 /** calculate number of macroblocks in a tile */
 #define IVI_MBs_PER_TILE(tile_width, tile_height, mb_size) \
     ((((tile_width) + (mb_size) - 1) / (mb_size)) * (((tile_height) + (mb_size) - 1) / (mb_size)))
 
 /** convert unsigned values into signed ones (the sign is in the LSB) */
-/* TODO: find a way to calculate this without the conditional using bit magic */
 #define IVI_TOSIGNED(val) (-(((val) >> 1) ^ -((val) & 1)))
 
 /** scales motion vector */
 static inline int ivi_scale_mv(int mv, int mv_scale)
 {
     return (mv + (mv > 0) + (mv_scale - 1)) >> mv_scale;
 }
 
 /**
  *  Generates a huffman codebook from the given descriptor
  *  and converts it into the FFmpeg VLC table.
  *
  *  @param cb   [in]  pointer to codebook descriptor
  *  @param vlc  [out] where to place the generated VLC table
  *  @param flag [in]  flag: 1 - for static or 0 for dynamic tables
  *  @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.
+ * Initializes static codes used for macroblock and block decoding.
+ */
+void ff_ivi_init_static_vlc(void);
+
+/**
+ *  Decodes a huffman codebook descriptor from the bitstream
+ *  and selects specified huffman table.
  *
- *  @param gb   [in,out] the GetBit context
- *  @param desc [out] ptr to descriptor to be filled with data
- *  @return     selector indicating huffman table:
- *              (0...6 - predefined, 7 - custom one supplied with the bitstream)
+ *  @param gb           [in,out] the GetBit context
+ *  @param desc_coded   [in] flag signalling if table descriptor was coded
+ *  @param which_tab    [in] codebook purpose (IVI_MB_HUFF or IVI_BLK_HUFF)
+ *  @param huff_tab     [out] pointer to the descriptor of the selected table
+ *  @param avctx        [in] AVCodecContext pointer
+ *  @return             zero on success, negative value otherwise
  */
-int  ff_ivi_dec_huff_desc(GetBitContext *gb, IVIHuffDesc *desc);
+int  ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab,
+                          IVIHuffTab *huff_tab, AVCodecContext *avctx);
 
 /**
  *  Compares two huffman codebook descriptors.
  *
  *  @param desc1    [in] ptr to the 1st descriptor to compare
  *  @param desc2    [in] ptr to the 2nd descriptor to compare
  *  @return         comparison result: 0 - equal, 1 - not equal
  */
 int  ff_ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2);
 
@@ skipping 85 matching lines @@
  */
 uint16_t ivi_calc_band_checksum (IVIBandDesc *band);
 
 /**
  *  Verifies that band data lies in range.
  */
 int ivi_check_band (IVIBandDesc *band, const uint8_t *ref, int pitch);
 #endif
 
 #endif /* AVCODEC_IVI_COMMON_H */