#define _XOPEN_SOURCE 600
-#include <sys/time.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <regex.h>
#include <sys/select.h>
-#include <stdbool.h>
#include "para.h"
#include "error.h"
int use_exp_vlc;
/** Whether perceptual noise is added. */
int use_noise_coding;
+ /** Depends on number of the bits per second and the frame length. */
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];
};
#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);
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);
*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 */
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);
+ 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)
+static int 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;
- t->error = 0;
ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
if (ret < 0)
goto err;
if (ret == 0)
- return;
+ return 0;
btr_merge(btrn, fn->min_iqs);
len = btr_next_buffer(btrn, (char **)&in);
ret = -E_WMADEC_EOF;
fn->min_iqs += 4096;
goto next_buffer;
}
- fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
+ fn->min_iqs = 2 * (WMA_FRAME_SKIP + pwd->ahi.block_align);
fn->private_data = pwd;
converted = pwd->ahi.header_len;
goto success;
}
- 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;
+ fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
+ 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);
- goto next_buffer;
+ return 0;
err:
assert(ret < 0);
- t->error = ret;
- btr_remove_node(btrn);
+ btr_remove_node(&fn->btrn);
+ return ret;
}
static void wmadec_open(struct filter_node *fn)
projects / paraslash.git / blobdiff