#include "libavutil/lfg.h"
#include "libavutil/float_dsp.h"
+#define ATRAC9_SF_VLC_BITS 8
+
typedef struct ATRAC9ChannelData {
int band_ext;
int q_unit_cnt;
b->channel[0].band_ext = get_bits(gb, 2);
b->channel[0].band_ext = ext_band > 2 ? b->channel[0].band_ext : 4;
- if (!get_bits(gb, 5))
+ if (!get_bits(gb, 5)) {
+ for (int i = 0; i <= stereo; i++) {
+ ATRAC9ChannelData *c = &b->channel[i];
+ const int count = at9_tab_band_ext_cnt[c->band_ext][ext_band];
+ for (int j = 0; j < count; j++) {
+ int len = at9_tab_band_ext_lengths[c->band_ext][ext_band][j];
+ c->band_ext_data[j] = av_clip_uintp2_c(c->band_ext_data[j], len);
+ }
+ }
+
return 0;
+ }
for (int i = 0; i <= stereo; i++) {
ATRAC9ChannelData *c = &b->channel[i];
c->scalefactors[0] = get_bits(gb, len);
for (int i = 1; i < b->band_ext_q_unit; i++) {
- int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, 9, 2);
+ int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table,
+ ATRAC9_SF_VLC_BITS, 1);
c->scalefactors[i] = val & ((1 << len) - 1);
}
const VLC *tab = &s->sf_vlc[1][len];
for (int i = 0; i < unit_cnt; i++) {
- int dist = get_vlc2(gb, tab->table, 9, 2);
+ int dist = get_vlc2(gb, tab->table, ATRAC9_SF_VLC_BITS, 1);
c->scalefactors[i] = baseline[i] + dist;
}
c->scalefactors[0] = get_bits(gb, len);
for (int i = 1; i < unit_cnt; i++) {
- int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, 9, 2);
+ int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table,
+ ATRAC9_SF_VLC_BITS, 1);
c->scalefactors[i] = val & ((1 << len) - 1);
}
const int groups = bands >> huff->value_cnt_pow;
for (int j = 0; j < groups; j++) {
- uint16_t val = get_vlc2(gb, tab->table, 9, huff->max_bit_size);
+ uint16_t val = get_vlc2(gb, tab->table, 9, 2);
for (int k = 0; k < huff->value_cnt; k++) {
coeffs[k] = sign_extend(val, huff->value_bits);
ff_free_vlc(&s->coeff_vlc[i][j][k]);
ff_mdct_end(&s->imdct);
- av_free(s->fdsp);
+ av_freep(&s->fdsp);
return 0;
}
GetBitContext gb;
ATRAC9Context *s = avctx->priv_data;
int version, block_config_idx, superframe_idx, alloc_c_len;
+ const uint8_t (*tab)[2];
+ int ret;
s->avctx = avctx;
s->alloc_curve[i - 1][j] = at9_tab_b_dist[(j * alloc_c_len) / i];
/* Unsigned scalefactor VLCs */
+ tab = at9_sfb_a_tab;
for (int i = 1; i < 7; i++) {
const HuffmanCodebook *hf = &at9_huffman_sf_unsigned[i];
- init_vlc(&s->sf_vlc[0][i], 9, hf->size, hf->bits, 1, 1, hf->codes,
- 2, 2, 0);
+ ret = ff_init_vlc_from_lengths(&s->sf_vlc[0][i], ATRAC9_SF_VLC_BITS,
+ hf->size, &tab[0][1], 2,
+ &tab[0][0], 2, 1, 0, 0, avctx);
+ if (ret < 0)
+ return ret;
+ tab += hf->size;
}
/* Signed scalefactor VLCs */
+ tab = at9_sfb_b_tab;
for (int i = 2; i < 6; i++) {
const HuffmanCodebook *hf = &at9_huffman_sf_signed[i];
- int nums = hf->size;
- int16_t sym[32];
- for (int j = 0; j < nums; j++)
- sym[j] = sign_extend(j, hf->value_bits);
-
- ff_init_vlc_sparse(&s->sf_vlc[1][i], 9, hf->size, hf->bits, 1, 1,
- hf->codes, 2, 2, sym, sizeof(*sym), sizeof(*sym), 0);
+ /* The symbols are signed integers in the range -16..15;
+ * the values in the source table are offset by 16 to make
+ * them fit into an uint8_t; the -16 reverses this shift. */
+ ret = ff_init_vlc_from_lengths(&s->sf_vlc[1][i], ATRAC9_SF_VLC_BITS,
+ hf->size, &tab[0][1], 2,
+ &tab[0][0], 2, 1, -16, 0, avctx);
+ if (ret < 0)
+ return ret;
+ tab += hf->size;
}
/* Coefficient VLCs */
+ tab = at9_coeffs_tab;
for (int i = 0; i < 2; i++) {
- for (int j = 0; j < 8; j++) {
- for (int k = 0; k < 4; k++) {
+ for (int j = 2; j < 8; j++) {
+ for (int k = i; k < 4; k++) {
const HuffmanCodebook *hf = &at9_huffman_coeffs[i][j][k];
- init_vlc(&s->coeff_vlc[i][j][k], 9, hf->size, hf->bits, 1, 1,
- hf->codes, 2, 2, 0);
+ ret = ff_init_vlc_from_lengths(&s->coeff_vlc[i][j][k], 9,
+ hf->size, &tab[0][1], 2,
+ &tab[0][0], 2, 1, 0, 0, avctx);
+ if (ret < 0)
+ return ret;
+ tab += hf->size;
}
}
}