Mercurial > libavcodec.hg
comparison wmadec.c @ 10300:4d1b9ca628fc libavcodec
Drop unused args from vector_fmul_add_add, simpify code, and rename
The src3 and step arguments to vector_fmul_add_add() are always zero
and one, respectively. This removes these arguments from the function,
simplifies the code accordingly, and renames the function to better
match the new operation.
author | mru |
---|---|
date | Sun, 27 Sep 2009 16:51:54 +0000 |
parents | ae08043eb532 |
children | 6aaf7c9e768b |
comparison
equal
deleted
inserted
replaced
10299:a1654cd1b5b9 | 10300:4d1b9ca628fc |
---|---|
299 /* left part */ | 299 /* left part */ |
300 if (s->block_len_bits <= s->prev_block_len_bits) { | 300 if (s->block_len_bits <= s->prev_block_len_bits) { |
301 block_len = s->block_len; | 301 block_len = s->block_len; |
302 bsize = s->frame_len_bits - s->block_len_bits; | 302 bsize = s->frame_len_bits - s->block_len_bits; |
303 | 303 |
304 s->dsp.vector_fmul_add_add(out, in, s->windows[bsize], | 304 s->dsp.vector_fmul_add(out, in, s->windows[bsize], |
305 out, 0, block_len, 1); | 305 out, block_len); |
306 | 306 |
307 } else { | 307 } else { |
308 block_len = 1 << s->prev_block_len_bits; | 308 block_len = 1 << s->prev_block_len_bits; |
309 n = (s->block_len - block_len) / 2; | 309 n = (s->block_len - block_len) / 2; |
310 bsize = s->frame_len_bits - s->prev_block_len_bits; | 310 bsize = s->frame_len_bits - s->prev_block_len_bits; |
311 | 311 |
312 s->dsp.vector_fmul_add_add(out+n, in+n, s->windows[bsize], | 312 s->dsp.vector_fmul_add(out+n, in+n, s->windows[bsize], |
313 out+n, 0, block_len, 1); | 313 out+n, block_len); |
314 | 314 |
315 memcpy(out+n+block_len, in+n+block_len, n*sizeof(float)); | 315 memcpy(out+n+block_len, in+n+block_len, n*sizeof(float)); |
316 } | 316 } |
317 | 317 |
318 out += s->block_len; | 318 out += s->block_len; |