Mercurial > libavcodec.hg
changeset 9666:c80df3181479 libavcodec
Change from INIT_VLC_USE_STATIC to INIT_VLC_USE_NEW_STATIC in atrac3
| author | banan |
|---|---|
| date | Sun, 17 May 2009 16:12:07 +0000 |
| parents | 87d4e5e27d9f |
| children | 6f80791c9195 |
| files | atrac3.c atrac3data.h |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/atrac3.c Sun May 17 10:31:16 2009 +0000 +++ b/atrac3.c Sun May 17 16:12:07 2009 +0000 @@ -933,6 +933,8 @@ int i; const uint8_t *edata_ptr = avctx->extradata; ATRAC3Context *q = avctx->priv_data; + static VLC_TYPE atrac3_vlc_table[4096][2]; + static int vlcs_initialized = 0; /* Take data from the AVCodecContext (RM container). */ q->sample_rate = avctx->sample_rate; @@ -1023,10 +1025,15 @@ /* Initialize the VLC tables. */ + if (!vlcs_initialized) { for (i=0 ; i<7 ; i++) { + spectral_coeff_tab[i].table = &atrac3_vlc_table[atrac3_vlc_offs[i]]; + spectral_coeff_tab[i].table_allocated = atrac3_vlc_offs[i + 1] - atrac3_vlc_offs[i]; init_vlc (&spectral_coeff_tab[i], 9, huff_tab_sizes[i], huff_bits[i], 1, 1, - huff_codes[i], 1, 1, INIT_VLC_USE_STATIC); + huff_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC); + } + vlcs_initialized = 1; } init_atrac3_transforms(q);
--- a/atrac3data.h Sun May 17 10:31:16 2009 +0000 +++ b/atrac3data.h Sun May 17 16:12:07 2009 +0000 @@ -105,6 +105,10 @@ huffbits1,huffbits2,huffbits3,huffbits4,huffbits5,huffbits6,huffbits7, }; +static const uint16_t atrac3_vlc_offs[] = { + 0,512,1024,1536,2048,2560,3072,3584,4096 +}; + /* selector tables */ static const uint8_t CLCLengthTab[8] = {0, 4, 3, 3, 4, 4, 5, 6};