pwd->block_len, lsp_coefs);
}
-/*
- * Parse a vlc code, faster then get_vlc().
- *
- * \param bits The number of bits which will be read at once, must be
- * identical to nb_bits in init_vlc()
- *
- * \param max_depth The number of times bits bits must be read to completely
- * read the longest vlc code = (max_vlc_length + bits - 1) / bits.
- */
-static int get_vlc2(struct getbit_context *s, VLC_TYPE(*table)[2],
- int bits, int max_depth)
-{
- int code;
-
- OPEN_READER(re, s)
- UPDATE_CACHE(re, s)
- GET_VLC(code, re, s, table, bits, max_depth)
- CLOSE_READER(re, s)
- return code;
-}
-
/* Decode exponents coded with VLC codes. */
static int decode_exp_vlc(struct private_wmadec_data *pwd, int ch)
{
last_exp = 36;
while (q < q_end) {
- code = get_vlc2(&pwd->gb, pwd->exp_vlc.table, EXPVLCBITS, EXPMAX);
+ code = get_vlc(&pwd->gb, pwd->exp_vlc.table, EXPVLCBITS, EXPMAX);
if (code < 0)
return -1;
/* NOTE: this offset is the same as MPEG4 AAC ! */
return -E_INCOHERENT_BLOCK_LEN;
if (pwd->ahi.channels == 2)
- pwd->ms_stereo = get_bits1(&pwd->gb);
+ pwd->ms_stereo = get_bit(&pwd->gb);
v = 0;
for (ch = 0; ch < pwd->ahi.channels; ch++) {
- int a = get_bits1(&pwd->gb);
+ int a = get_bit(&pwd->gb);
pwd->channel_coded[ch] = a;
v |= a;
}
int i, m, a;
m = pwd->exponent_high_sizes[bsize];
for (i = 0; i < m; i++) {
- a = get_bits1(&pwd->gb);
+ a = get_bit(&pwd->gb);
pwd->high_band_coded[ch][i] = a;
/* if noise coding, the coefficients are not transmitted */
if (a)
7) - 19;
} else {
code =
- get_vlc2(&pwd->gb,
+ get_vlc(&pwd->gb,
pwd->
hgain_vlc.
table,
}
/* exponents can be reused in short blocks. */
- if ((pwd->block_len_bits == pwd->frame_len_bits) || get_bits1(&pwd->gb)) {
+ if ((pwd->block_len_bits == pwd->frame_len_bits) || get_bit(&pwd->gb)) {
for (ch = 0; ch < pwd->ahi.channels; ch++) {
if (pwd->channel_coded[ch]) {
if (pwd->use_exp_vlc) {
memset(ptr, 0, pwd->block_len * sizeof(int16_t));
for (;;) {
code =
- get_vlc2(&pwd->gb, coef_vlc->table, VLCBITS,
+ get_vlc(&pwd->gb, coef_vlc->table, VLCBITS,
VLCMAX);
if (code < 0)
return -1;
run = run_table[code];
level = level_table[code];
}
- sign = get_bits1(&pwd->gb);
+ sign = get_bit(&pwd->gb);
if (!sign)
level = -level;
ptr += run;
static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
int *data_size, const uint8_t *buf, int buf_size)
{
- int ret, nb_frames, bit_offset, i, pos, len;
- uint8_t *q;
+ int ret;
int16_t *samples;
static int frame_count;
return 0;
buf_size = pwd->ahi.block_align;
samples = data;
- init_get_bits(&pwd->gb, buf, buf_size * 8);
+ init_get_bits(&pwd->gb, buf, buf_size);
if (pwd->use_bit_reservoir) {
+ int i, nb_frames, bit_offset, pos, len;
+ uint8_t *q;
+
/* read super frame header */
skip_bits(&pwd->gb, 4); /* super frame index */
nb_frames = get_bits(&pwd->gb, 4) - 1;
/* XXX: bit_offset bits into last frame */
init_get_bits(&pwd->gb, pwd->last_superframe,
- MAX_CODED_SUPERFRAME_SIZE * 8);
+ MAX_CODED_SUPERFRAME_SIZE);
/* skip unused bits */
if (pwd->last_bitoffset > 0)
skip_bits(&pwd->gb, pwd->last_bitoffset);
/* read each frame starting from bit_offset */
pos = bit_offset + 4 + 4 + pwd->byte_offset_bits + 3;
init_get_bits(&pwd->gb, buf + (pos >> 3),
- (MAX_CODED_SUPERFRAME_SIZE - (pos >> 3)) * 8);
+ (MAX_CODED_SUPERFRAME_SIZE - (pos >> 3)));
len = pos & 7;
if (len > 0)
skip_bits(&pwd->gb, len);