int byte_offset_bits;
/** Only used if use_exp_vlc is true. */
struct vlc exp_vlc;
- int exponent_sizes[BLOCK_NB_SIZES];
uint16_t exponent_bands[BLOCK_NB_SIZES][25];
/** The index of the first coef in high band. */
int high_band_start[BLOCK_NB_SIZES];
const uint8_t *table;
for (k = 0; k < pwd->nb_block_sizes; k++) {
- block_len = pwd->frame_len >> k;
+ int exponent_size;
+ block_len = pwd->frame_len >> k;
table = NULL;
a = pwd->frame_len_bits - BLOCK_MIN_BITS - k;
if (a < 3) {
n = *table++;
for (i = 0; i < n; i++)
pwd->exponent_bands[k][i] = table[i];
- pwd->exponent_sizes[k] = n;
+ exponent_size = n;
} else {
j = 0;
lpos = 0;
break;
lpos = pos;
}
- pwd->exponent_sizes[k] = j;
+ exponent_size = j;
}
/* max number of coefs */
/* high freq computation */
pwd->high_band_start[k] = (int) ((block_len * 2 * high_freq)
/ ahi->sample_rate + 0.5);
- n = pwd->exponent_sizes[k];
+ n = exponent_size;
j = 0;
pos = 0;
for (i = 0; i < n; i++) {
if (pwd->use_exp_vlc) {
PARA_INFO_LOG("using exp_vlc\n");
- init_vlc(&pwd->exp_vlc, EXPVLCBITS,
- sizeof(wma_scale_huffbits), wma_scale_huffbits,
- wma_scale_huffcodes, 4);
+ init_vlc(&pwd->exp_vlc, EXPVLCBITS, sizeof(wma_scale_huffbits),
+ wma_scale_huffbits, wma_scale_huffcodes, 4);
} else {
PARA_INFO_LOG("using curve\n");
wma_lsp_to_curve_init(pwd, pwd->frame_len);
static void wmadec_post_select(__a_unused struct sched *s, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
- int ret, converted;
+ int ret, converted, out_size;
struct private_wmadec_data *pwd = fn->private_data;
struct btr_node *btrn = fn->btrn;
size_t len;
- char *in;
+ char *in, *out;
next_buffer:
converted = 0;
goto success;
}
fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
- for (;;) {
- char *out;
- int out_size = WMA_OUTPUT_BUFFER_SIZE;
- if (converted + fn->min_iqs > len)
- break;
- out = para_malloc(WMA_OUTPUT_BUFFER_SIZE);
- ret = wma_decode_superframe(pwd, out,
- &out_size, (uint8_t *)in + converted + WMA_FRAME_SKIP,
- len - WMA_FRAME_SKIP);
- if (ret < 0) {
- free(out);
- goto err;
- }
- btr_add_output(out, out_size, btrn);
- converted += ret + WMA_FRAME_SKIP;
+ if (fn->min_iqs > len)
+ goto success;
+ out_size = WMA_OUTPUT_BUFFER_SIZE;
+ out = para_malloc(out_size);
+ ret = wma_decode_superframe(pwd, out, &out_size,
+ (uint8_t *)in + WMA_FRAME_SKIP, len - WMA_FRAME_SKIP);
+ if (ret < 0) {
+ free(out);
+ goto err;
}
+ out = para_realloc(out, out_size);
+ if (out_size > 0)
+ btr_add_output(out, out_size, btrn);
+ converted += ret + WMA_FRAME_SKIP;
success:
btr_consume(btrn, converted);
return;
err:
assert(ret < 0);
t->error = ret;
- btr_remove_node(btrn);
+ btr_remove_node(&fn->btrn);
}
static void wmadec_open(struct filter_node *fn)