(flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_LE);
}
-void ff_ivi_init_static_vlc()
+void ff_ivi_init_static_vlc(void)
{
int i;
- static VLC table_data[8192 * 16][2];
+ static VLC_TYPE table_data[8192 * 16][2];
static int initialized_vlcs = 0;
if (initialized_vlcs)
initialized_vlcs = 1;
}
-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)
{
- int tab_sel, i;
+ int i, result;
+ IVIHuffDesc new_huff;
- tab_sel = get_bits(gb, 3);
- if (tab_sel == 7) {
- /* custom huffman table (explicitly encoded) */
- desc->num_rows = get_bits(gb, 4);
-
- for (i = 0; i < desc->num_rows; i++)
- desc->xbits[i] = get_bits(gb, 4);
+ 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 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 */
}
}
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);
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);
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];
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)