ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/ivi_common.c

 /*
  * 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 15 matching lines @@
  * Indeo5 decoders.
  */
 
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "ivi_common.h"
 #include "libavutil/common.h"
 #include "ivi_dsp.h"
 
+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
+
+VLC ff_ivi_mb_vlc_tabs [8];
+VLC ff_ivi_blk_vlc_tabs[8];
+
 /**
  *  Reverses "nbits" bits of the value "val" and returns the result
  *  in the least significant bits.
  */
 static uint16_t inv_bits(uint16_t val, int nbits)
 {
     uint16_t res;
 
     if (nbits <= 8) {
         res = av_reverse[val] >> (8-nbits);
@@ skipping 27 matching lines @@
             codewords[pos] = inv_bits((prefix | j), bits[pos]);
             if (!bits[pos])
                 bits[pos] = 1;
 
             pos++;
         }//for j
     }//for i
 
     /* number of codewords = pos */
     return init_vlc(vlc, IVI_VLC_BITS, pos, bits, 1, 1, codewords, 2, 2,
-                    (flag & 1) | INIT_VLC_LE);
+                    (flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_LE);
 }
 
-int ff_ivi_dec_huff_desc(GetBitContext *gb, IVIHuffDesc *desc)
+void ff_ivi_init_static_vlc(void)
 {
-    int tab_sel, i;
+    int i;
+    static VLC_TYPE table_data[8192 * 16][2];
+    static int initialized_vlcs = 0;
 
-    tab_sel = get_bits(gb, 3);
-    if (tab_sel == 7) {
-        /* custom huffman table (explicitly encoded) */
-        desc->num_rows = get_bits(gb, 4);
+    if (initialized_vlcs)
+        return;
+    for (i = 0; i < 8; i++) {
+        ff_ivi_mb_vlc_tabs[i].table = table_data + i * 2 * 8192;
+        ff_ivi_mb_vlc_tabs[i].table_allocated = 8192;
+        ff_ivi_create_huff_from_desc(&ff_ivi_mb_huff_desc[i],  &ff_ivi_mb_vlc_tabs[i],  1);
+        ff_ivi_blk_vlc_tabs[i].table = table_data + (i * 2 + 1) * 8192;
+        ff_ivi_blk_vlc_tabs[i].table_allocated = 8192;
+        ff_ivi_create_huff_from_desc(&ff_ivi_blk_huff_desc[i], &ff_ivi_blk_vlc_tabs[i], 1);
+    }
+    initialized_vlcs = 1;
+}
 
-        for (i = 0; i < desc->num_rows; i++)
-            desc->xbits[i] = get_bits(gb, 4);
+int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab,
+                         IVIHuffTab *huff_tab, AVCodecContext *avctx)
+{
+    int         i, result;
+    IVIHuffDesc new_huff;
+
+    if (!desc_coded) {
+        /* select default table */
+        huff_tab->tab = (which_tab) ? &ff_ivi_blk_vlc_tabs[7]
+            : &ff_ivi_mb_vlc_tabs [7];
+    } else {
+        huff_tab->tab_sel = get_bits(gb, 3);
+        if (huff_tab->tab_sel == 7) {
+            /* custom huffman table (explicitly encoded) */
+            new_huff.num_rows = get_bits(gb, 4);
+
+            for (i = 0; i < new_huff.num_rows; i++)
+                new_huff.xbits[i] = get_bits(gb, 4);
+
+            /* Have we got the same custom table? Rebuild if not. */
+            if (ff_ivi_huff_desc_cmp(&new_huff, &huff_tab->cust_desc)) {
+                ff_ivi_huff_desc_copy(&huff_tab->cust_desc, &new_huff);
+
+                if (huff_tab->cust_tab.table)
+                    free_vlc(&huff_tab->cust_tab);
+                result = ff_ivi_create_huff_from_desc(&huff_tab->cust_desc,
+                        &huff_tab->cust_tab, 0);
+                if (result) {
+                    av_log(avctx, AV_LOG_ERROR,
+                           "Error while initializing custom vlc table!\n");
+                    return -1;
+                }
+            }
+            huff_tab->tab = &huff_tab->cust_tab;
+        } else {
+            /* select one of predefined tables */
+            huff_tab->tab = (which_tab) ? &ff_ivi_blk_vlc_tabs[huff_tab->tab_sel]
+                : &ff_ivi_mb_vlc_tabs [huff_tab->tab_sel];
+        }
     }
 
-    return tab_sel;
+    return 0;
 }
 
 int ff_ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2)
 {
     return    desc1->num_rows != desc2->num_rows
            || memcmp(desc1->xbits, desc2->xbits, desc1->num_rows);
 }
 
 void ff_ivi_huff_desc_copy(IVIHuffDesc *dst, const IVIHuffDesc *src)
 {
@@ skipping 49 matching lines @@
             if (!band->bufs[0] || !band->bufs[1])
                 return AVERROR(ENOMEM);
 
             /* allocate the 3rd band buffer for scalability mode */
             if (cfg->luma_bands > 1) {
                 band->bufs[2] = av_malloc(buf_size);
                 if (!band->bufs[2])
                     return AVERROR(ENOMEM);
             }
 
-            planes[p].bands[0].huff_desc.num_rows = 0; /* reset custom vlc */
+            planes[p].bands[0].blk_vlc.cust_desc.num_rows = 0; /* reset custom vlc */
         }
     }
 
     return 0;
 }
 
 void av_cold ff_ivi_free_buffers(IVIPlaneDesc *planes)
 {
     int p, b, t;
 
     for (p = 0; p < 3; p++) {
         for (b = 0; b < planes[p].num_bands; b++) {
             av_freep(&planes[p].bands[b].bufs[0]);
             av_freep(&planes[p].bands[b].bufs[1]);
             av_freep(&planes[p].bands[b].bufs[2]);
 
+            if (planes[p].bands[b].blk_vlc.cust_tab.table)
+                free_vlc(&planes[p].bands[b].blk_vlc.cust_tab);
             for (t = 0; t < planes[p].bands[b].num_tiles; t++)
                 av_freep(&planes[p].bands[b].tiles[t].mbs);
             av_freep(&planes[p].bands[b].tiles);
         }
         av_freep(&planes[p].bands);
     }
 }
 
 int av_cold ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height)
 {
     int         p, b, x, y, x_tiles, y_tiles, t_width, t_height;
     IVIBandDesc *band;
     IVITile     *tile, *ref_tile;
 
     for (p = 0; p < 3; p++) {
         t_width  = !p ? tile_width  : (tile_width  + 3) >> 2;
         t_height = !p ? tile_height : (tile_height + 3) >> 2;
 
+        if (!p && planes[0].num_bands == 4) {
+            t_width  >>= 1;
+            t_height >>= 1;
+        }
+
         for (b = 0; b < planes[p].num_bands; b++) {
             band = &planes[p].bands[b];
             x_tiles = IVI_NUM_TILES(band->width, t_width);
             y_tiles = IVI_NUM_TILES(band->height, t_height);
             band->num_tiles = x_tiles * y_tiles;
 
             av_freep(&band->tiles);
             band->tiles = av_mallocz(band->num_tiles * sizeof(IVITile));
             if (!band->tiles)
                 return AVERROR(ENOMEM);
@@ skipping 110 matching lines @@
                 buf_offs -= blk_size;
                 buf_offs += blk_size * band->pitch;
             }
 
             if (cbp & 1) { /* block coded ? */
                 scan_pos = -1;
                 memset(trvec, 0, num_coeffs*sizeof(trvec[0])); /* zero transform vector */
                 memset(col_flags, 0, sizeof(col_flags));      /* zero column flags */
 
                 while (scan_pos <= num_coeffs) {
-                    sym = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1);
+                    sym = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1);
                     if (sym == rvmap->eob_sym)
                         break; /* End of block */
 
                     if (sym == rvmap->esc_sym) { /* Escape - run/val explicitly coded using 3 vlc codes */
-                        run = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1) + 1;
-                        lo  = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1);
-                        hi  = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1);
+                        run = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1) + 1;
+                        lo  = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1);
+                        hi  = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1);
                         val = IVI_TOSIGNED((hi << 6) | lo); /* merge them and convert into signed val */
                     } else {
                         run = rvmap->runtab[sym];
                         val = rvmap->valtab[sym];
                     }
 
                     /* de-zigzag and dequantize */
                     scan_pos += run;
                     if (scan_pos >= num_coeffs)
                         break;
                     pos = band->scan[scan_pos];
 
                     if (IVI_DEBUG && !val)
                         av_log(NULL, AV_LOG_ERROR, "Val = 0 encountered!\n");
 
                     q = (base_tab[pos] * scale_tab[quant]) >> 8;
                     if (q > 1)
                         val = val * q + FFSIGN(val) * ((q >> 1) - (q & 1));
                     trvec[pos] = val;
-                    col_flags[pos & col_mask] |= val; /* track columns containing non-zero coeffs */
+                    col_flags[pos & col_mask] |= !!val; /* track columns containing non-zero coeffs */
                 }// while
 
                 if (scan_pos >= num_coeffs && sym != rvmap->eob_sym)
                     return -1; /* corrupt block data */
 
                 /* undoing DC coeff prediction for intra-blocks */
                 if (is_intra && band->is_2d_trans) {
                     prev_dc      += trvec[0];
                     trvec[0]      = prev_dc;
                     col_flags[0] |= !!prev_dc;
@@ skipping 559 matching lines @@
     -17,  -3,   1,   1,   1,   4,  -1,  -1,  -4,   3,  -1,   5,  -3,  -1,  -9,   9,
      -5,   1,  18, -18,   2,   1,  -2,   1,  -1,  -1,   1,  19,  -1,   1, -19,  -1,
       4,   1,  -1,   1,   7,  -4,  -2,   2,  -7,  10,  -1, -10,   1,  20,  -1, -20,
       1,  -1,   2,   4,  -2,   5,   1,  -5,   6,  -4,  21,   4,   2,  -6, -21,  -1,
      -2,   1,  -4,  -1,  -3,  22,  -1,   1,   3, -22,  -1,  11, -11,   1,   1,   1,
       8,  -8,   2,   2,  -1,  -2,  -2,  -1,   1,  -1,  -5,   5,   2,  23, -23,  -2,
       1,  -1,  24, -24,  -1,  -1,   7,   6,  -7,   5,  -6,  12,  -3,   3,   1,  -5,
       1,   1, -12,  25,  -1,  -5,   5, -25,  -1,   1,   9,   1,  -1,  -9,  26, -26}
 }
 };