X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=wmadec_filter.c;h=5151622e223d213550e90ce96c634ffade5840f7;hb=5b273f3a68f69819f3607044bfa7ca0ebe2cb135;hp=c49489b70eea8d1d9ae271f318cefbb3a349e1e8;hpb=df6606e438a34c7bfc325e5f320843d1e97d3f7a;p=paraslash.git diff --git a/wmadec_filter.c b/wmadec_filter.c index c49489b7..5151622e 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -664,41 +664,30 @@ static void wma_window(struct private_wmadec_data *s, float *out) if (s->block_len_bits <= s->prev_block_len_bits) { block_len = s->block_len; bsize = s->frame_len_bits - s->block_len_bits; - vector_mult_add(out, in, s->windows[bsize], out, block_len); - } else { block_len = 1 << s->prev_block_len_bits; n = (s->block_len - block_len) / 2; bsize = s->frame_len_bits - s->prev_block_len_bits; - vector_mult_add(out + n, in + n, s->windows[bsize], out + n, block_len); - memcpy(out + n + block_len, in + n + block_len, - n * sizeof(float)); + n * sizeof(float)); } - out += s->block_len; in += s->block_len; - /* right part */ if (s->block_len_bits <= s->next_block_len_bits) { block_len = s->block_len; bsize = s->frame_len_bits - s->block_len_bits; - vector_mult_reverse(out, in, s->windows[bsize], block_len); - } else { block_len = 1 << s->next_block_len_bits; n = (s->block_len - block_len) / 2; bsize = s->frame_len_bits - s->next_block_len_bits; - memcpy(out, in, n * sizeof(float)); - vector_mult_reverse(out + n, in + n, s->windows[bsize], - block_len); - + block_len); memset(out + n + block_len, 0, n * sizeof(float)); } }