};
#define EXPVLCBITS 8
-#define EXPMAX ((19 + EXPVLCBITS - 1) / EXPVLCBITS)
+#define EXPMAX DIV_ROUND_UP(19, EXPVLCBITS)
#define HGAINVLCBITS 9
-#define HGAINMAX ((13 + HGAINVLCBITS - 1) / HGAINVLCBITS)
+#define HGAINMAX DIV_ROUND_UP(13, HGAINVLCBITS)
#define VLCBITS 9
-#define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
+#define VLCMAX DIV_ROUND_UP(22, VLCBITS)
-#define SINE_WINDOW(x) float sine_ ## x[x] __a_aligned(16)
+#define SINE_WINDOW(x) static float sine_ ## x[x] __a_aligned(16)
SINE_WINDOW(128);
SINE_WINDOW(256);
*coefs++ = 0.0;
continue;
}
- mult1 = mult;
n1 = pwd->exponent_high_sizes[bsize];
/* compute power of high bands */
exponents = pwd->exponents[ch] +
mult1 = sqrt(exp_power[j]
/ exp_power[last_high_band]);
/* XXX: use a table */
- mult1 = mult1 * pow(10,
- pwd->high_band_values[ch][j] * 0.05);
+ mult1 *= pow(10, pwd->high_band_values[ch][j] * 0.05);
mult1 /= (pwd->max_exponent[ch] * pwd->noise_mult);
mult1 *= mdct_norm;
for (i = 0; i < n; i++) {
}
next:
for (ch = 0; ch < pwd->ahi.channels; ch++) {
- int n4, index;
+ int n4, idx;
- n = pwd->block_len;
n4 = pwd->block_len / 2;
if (pwd->channel_coded[ch])
imdct(pwd->mdct_ctx[bsize], pwd->output, pwd->coefs[ch]);
memset(pwd->output, 0, sizeof(pwd->output));
/* multiply by the window and add in the frame */
- index = (pwd->frame_len / 2) + pwd->block_pos - n4;
- wma_window(pwd, &pwd->frame_out[ch][index]);
+ idx = (pwd->frame_len / 2) + pwd->block_pos - n4;
+ wma_window(pwd, &pwd->frame_out[ch][idx]);
}
/* update block number */
if (!pwd)
return;
wmadec_cleanup(pwd);
- free(fn->buf);
- fn->buf = NULL;
free(fn->private_data);
fn->private_data = NULL;
}
struct filter_node *fn = btr_context(btrn);
struct private_wmadec_data *pwd = fn->private_data;
- if (!strcmp(cmd, "samplerate")) {
- if (pwd->ahi.sample_rate == 0)
- return -ERRNO_TO_PARA_ERROR(ENAVAIL);
- *result = make_message("%u", pwd->ahi.sample_rate);
- return 1;
- }
- if (!strcmp(cmd, "channels")) {
- if (pwd->ahi.channels == 0)
- return -ERRNO_TO_PARA_ERROR(ENAVAIL);
- *result = make_message("%u", pwd->ahi.channels);
- return 1;
- }
- return -ERRNO_TO_PARA_ERROR(ENOTSUP);
-}
-
-#define WMADEC_MAX_PENDING (640 * 1024)
-
-static void wmadec_pre_select(struct sched *s, struct task *t)
-{
- struct filter_node *fn = container_of(t, struct filter_node, task);
- size_t iqs = btr_get_input_queue_size(fn->btrn);
-
- t->error = 0;
- if (iqs == 0)
- return;
- if (btr_bytes_pending(fn->btrn) > WMADEC_MAX_PENDING)
- return; /* FIXME, should use reasonable bound on timeout */
- s->timeout.tv_sec = 0;
- s->timeout.tv_usec = 1;
+ return decoder_execute(cmd, pwd->ahi.sample_rate, pwd->ahi.channels,
+ result);
}
#define WMA_OUTPUT_BUFFER_SIZE (128 * 1024)
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 = 0;
+ int ret, converted;
struct private_wmadec_data *pwd = fn->private_data;
struct btr_node *btrn = fn->btrn;
- size_t len, min_len;
+ size_t len;
char *in;
- min_len = pwd? WMA_FRAME_SKIP + pwd->ahi.block_align : 8192;
next_buffer:
+ converted = 0;
t->error = 0;
- ret = prepare_filter_node(btrn, min_len);
+ ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
if (ret < 0)
goto err;
if (ret == 0)
return;
+ btr_merge(btrn, fn->min_iqs);
len = btr_next_buffer(btrn, (char **)&in);
ret = -E_WMADEC_EOF;
- if (len < min_len)
+ if (len < fn->min_iqs)
goto err;
if (!pwd) {
ret = wma_decode_init(in, len, &pwd);
if (ret < 0)
goto err;
if (ret == 0) {
- min_len += 4096;
+ fn->min_iqs += 4096;
goto next_buffer;
}
+ fn->min_iqs = 2 * (WMA_FRAME_SKIP + pwd->ahi.block_align);
fn->private_data = pwd;
converted = pwd->ahi.header_len;
goto success;
}
+ fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
for (;;) {
char *out;
int out_size = WMA_OUTPUT_BUFFER_SIZE;
- if (converted + WMA_FRAME_SKIP + pwd->ahi.block_align > len)
+ if (converted + fn->min_iqs > len)
break;
out = para_malloc(WMA_OUTPUT_BUFFER_SIZE);
ret = wma_decode_superframe(pwd, out,
}
success:
btr_consume(btrn, converted);
- goto next_buffer;
+ return;
err:
assert(ret < 0);
- wmadec_close(fn);
t->error = ret;
- btr_del_node(btrn);
-}
-
-static ssize_t wmadec_convert(char *inbuffer, size_t len,
- struct filter_node *fn)
-{
- int ret, converted = 0;
- struct private_wmadec_data *pwd = fn->private_data;
-
- if (len <= WMA_FRAME_SKIP)
- return 0;
- if (!pwd) {
- ret = wma_decode_init(inbuffer, len, &pwd);
- if (ret <= 0)
- return ret;
- fn->private_data = pwd;
- fn->fc->channels = pwd->ahi.channels;
- fn->fc->samplerate = pwd->ahi.sample_rate;
- return pwd->ahi.header_len;
- }
- for (;;) {
- int out_size;
- if (converted + WMA_FRAME_SKIP + pwd->ahi.block_align > len)
- break;
- out_size = fn->bufsize - fn->loaded;
- if (out_size < 128 * 1024)
- break;
- ret = wma_decode_superframe(pwd, fn->buf + fn->loaded,
- &out_size, (uint8_t *)inbuffer + converted + WMA_FRAME_SKIP,
- len - WMA_FRAME_SKIP);
- if (ret < 0)
- return ret;
- fn->loaded += out_size;
- converted += ret + WMA_FRAME_SKIP;
- }
- return converted;
+ btr_remove_node(btrn);
}
static void wmadec_open(struct filter_node *fn)
{
- fn->bufsize = 1024 * 1024;
- fn->buf = para_malloc(fn->bufsize);
fn->private_data = NULL;
- fn->loaded = 0;
+ fn->min_iqs = 4096;
}
/**
{
f->open = wmadec_open;
f->close = wmadec_close;
- f->convert = wmadec_convert;
f->execute = wmadec_execute;
- f->pre_select = wmadec_pre_select;
+ f->pre_select = generic_filter_pre_select;
f->post_select = wmadec_post_select;
}