X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=7d89d112a53d074cf3538cf890062b7afa87278c;hp=061642aeaa7db199525e87fcda9059c1f939932c;hb=4744d937c4160898d1fe151257606430750e580c;hpb=8b8a81f7faf8faec7a14ebfca4ce2e5c6ad3ac40 diff --git a/wmadec_filter.c b/wmadec_filter.c index 061642ae..7d89d112 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -32,6 +32,7 @@ #include "ggo.h" #include "string.h" #include "sched.h" +#include "buffer_tree.h" #include "filter.h" #include "bitstream.h" #include "imdct.h" @@ -140,15 +141,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] __aligned(16) +#define SINE_WINDOW(x) static float sine_ ## x[x] __a_aligned(16) SINE_WINDOW(128); SINE_WINDOW(256); @@ -767,7 +768,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] + @@ -801,8 +801,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++) { @@ -1008,9 +1007,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]); @@ -1018,8 +1016,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 */ @@ -1179,9 +1177,9 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data, goto fail; samples += pwd->ahi.channels * pwd->frame_len; } - PARA_DEBUG_LOG("frame_len: %d, block_len: %d, outbytes: %zd, eaten: %d\n", + PARA_DEBUG_LOG("frame_len: %d, block_len: %d, outbytes: %d, eaten: %d\n", pwd->frame_len, pwd->block_len, - (int8_t *) samples - (int8_t *) data, pwd->ahi.block_align); + (int)((int8_t *)samples - (int8_t *)data), pwd->ahi.block_align); *data_size = (int8_t *)samples - (int8_t *)data; return pwd->ahi.block_align; fail: @@ -1190,60 +1188,93 @@ fail: return ret; } -static ssize_t wmadec_convert(char *inbuffer, size_t len, - struct filter_node *fn) +static void wmadec_close(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) + return; + wmadec_cleanup(pwd); + free(fn->private_data); + fn->private_data = NULL; +} + +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; + + 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; + struct private_wmadec_data *pwd = fn->private_data; + struct btr_node *btrn = fn->btrn; + size_t len; + char *in; + +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; + btr_merge(btrn, fn->min_iqs); + len = btr_next_buffer(btrn, (char **)&in); + ret = -E_WMADEC_EOF; + if (len < fn->min_iqs) + goto err; if (!pwd) { - ret = wma_decode_init(inbuffer, len, &pwd); - if (ret <= 0) - return ret; + ret = wma_decode_init(in, len, &pwd); + if (ret < 0) + goto err; + if (ret == 0) { + fn->min_iqs += 4096; + goto next_buffer; + } + fn->min_iqs = 2 * (WMA_FRAME_SKIP + pwd->ahi.block_align); fn->private_data = pwd; - fn->fc->channels = pwd->ahi.channels; - fn->fc->samplerate = pwd->ahi.sample_rate; - return pwd->ahi.header_len; + converted = pwd->ahi.header_len; + goto success; } + fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align; for (;;) { - int out_size; - if (converted + WMA_FRAME_SKIP + pwd->ahi.block_align > len) + char *out; + int out_size = WMA_OUTPUT_BUFFER_SIZE; + if (converted + fn->min_iqs > 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, + 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) - return ret; - fn->loaded += out_size; + if (ret < 0) { + free(out); + goto err; + } + btr_add_output(out, out_size, btrn); converted += ret + WMA_FRAME_SKIP; } - return converted; -} - -static void wmadec_close(struct filter_node *fn) -{ - struct private_wmadec_data *pwd = fn->private_data; - - if (!pwd) - return; - wmadec_cleanup(pwd); - free(fn->buf); - fn->buf = NULL; - free(fn->private_data); - fn->private_data = NULL; +success: + btr_consume(btrn, converted); + return; +err: + assert(ret < 0); + t->error = ret; + 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; } /** @@ -1255,5 +1286,7 @@ void wmadec_filter_init(struct filter *f) { f->open = wmadec_open; f->close = wmadec_close; - f->convert = wmadec_convert; + f->execute = wmadec_execute; + f->pre_select = generic_filter_pre_select; + f->post_select = wmadec_post_select; }