X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=0071337f38427cc98f341404a6819ee683352ecc;hp=b78d762792511890531c891a5027dee563cda195;hb=7df87a748fae6a9f20d337d79ec83978856f0c48;hpb=18483260c9f20ed4a79a9aa146d46e81b99c3e6e diff --git a/wmadec_filter.c b/wmadec_filter.c index b78d7627..0071337f 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -17,7 +17,6 @@ #define _XOPEN_SOURCE 600 -#include #include #include #include @@ -32,6 +31,7 @@ #include "ggo.h" #include "string.h" #include "sched.h" +#include "buffer_tree.h" #include "filter.h" #include "bitstream.h" #include "imdct.h" @@ -70,9 +70,10 @@ 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]; /** The index of the first coef in high band. */ int high_band_start[BLOCK_NB_SIZES]; @@ -140,15 +141,17 @@ 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) +/** \cond sine_winows */ + +#define SINE_WINDOW(x) static float sine_ ## x[x] __a_aligned(16) SINE_WINDOW(128); SINE_WINDOW(256); @@ -160,6 +163,7 @@ SINE_WINDOW(4096); static float *sine_windows[6] = { sine_128, sine_256, sine_512, sine_1024, sine_2048, sine_4096 }; +/** \endcond sine_windows */ /* Generate a sine window. */ static void sine_window_init(float *window, int n) @@ -226,8 +230,9 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, 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) { @@ -242,7 +247,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, 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; @@ -259,7 +264,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, break; lpos = pos; } - pwd->exponent_sizes[k] = j; + exponent_size = j; } /* max number of coefs */ @@ -267,7 +272,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, /* 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++) { @@ -501,9 +506,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); @@ -767,7 +771,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 +804,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 +1010,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 +1019,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 */ @@ -1190,41 +1191,6 @@ fail: return ret; } -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; -} - static void wmadec_close(struct filter_node *fn) { struct private_wmadec_data *pwd = fn->private_data; @@ -1232,18 +1198,83 @@ static void wmadec_close(struct filter_node *fn) if (!pwd) return; wmadec_cleanup(pwd); - free(fn->buf); - fn->buf = NULL; 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 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, out_size; + struct private_wmadec_data *pwd = fn->private_data; + struct btr_node *btrn = fn->btrn; + size_t len; + char *in, *out; + +next_buffer: + converted = 0; + ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); + if (ret < 0) + goto err; + if (ret == 0) + return 0; + 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(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; + converted = pwd->ahi.header_len; + goto success; + } + 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); + return 0; +err: + assert(ret < 0); + btr_remove_node(&fn->btrn); + return ret; +} + 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; }