X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=e58754f5f5658886f8e4d9c238b5093db1980dbe;hp=96fb50082d2bff52ba082904341851048c66c6ef;hb=01a7db579a518a1a03b940a5a42411e49123ac1b;hpb=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8 diff --git a/wmadec_filter.c b/wmadec_filter.c index 96fb5008..e58754f5 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "para.h" #include "error.h" @@ -72,7 +71,9 @@ struct private_wmadec_data { 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]; @@ -142,15 +143,15 @@ struct private_wmadec_data { }; #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); @@ -503,9 +504,8 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat 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); @@ -769,7 +769,6 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd, *coefs++ = 0.0; continue; } - mult1 = mult; n1 = pwd->exponent_high_sizes[bsize]; /* compute power of high bands */ exponents = pwd->exponents[ch] + @@ -803,8 +802,7 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd, 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++) { @@ -1010,9 +1008,8 @@ static int wma_decode_block(struct private_wmadec_data *pwd) } 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]); @@ -1020,8 +1017,8 @@ next: 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 */ @@ -1208,19 +1205,8 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result) 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 -E_BTR_NAVAIL; - *result = make_message("%u", pwd->ahi.sample_rate); - return 1; - } - if (!strcmp(cmd, "channels")) { - if (pwd->ahi.channels == 0) - return -E_BTR_NAVAIL; - *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) @@ -1228,11 +1214,11 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result) 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; @@ -1261,25 +1247,23 @@ next_buffer: 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); - goto next_buffer; + return; err: assert(ret < 0); t->error = ret;