projects
/
paraslash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df6606e
)
whitespace cleanups.
author
Andre Noll
<maan@systemlinux.org>
Sat, 17 Oct 2009 10:50:33 +0000
(12:50 +0200)
committer
Andre Noll
<maan@systemlinux.org>
Wed, 18 Nov 2009 18:34:16 +0000
(19:34 +0100)
wmadec_filter.c
patch
|
blob
|
history
diff --git
a/wmadec_filter.c
b/wmadec_filter.c
index c49489b70eea8d1d9ae271f318cefbb3a349e1e8..5151622e223d213550e90ce96c634ffade5840f7 100644
(file)
--- 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;
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);
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;
} 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);
vector_mult_add(out + n, in + n, s->windows[bsize], out + n,
block_len);
-
memcpy(out + n + block_len, in + 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;
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;
/* 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);
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;
} 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));
memcpy(out, in, n * sizeof(float));
-
vector_mult_reverse(out + n, in + n, s->windows[bsize],
vector_mult_reverse(out + n, in + n, s->windows[bsize],
- block_len);
-
+ block_len);
memset(out + n + block_len, 0, n * sizeof(float));
}
}
memset(out + n + block_len, 0, n * sizeof(float));
}
}