diff options
author | Loren Merritt <lorenm@u.washington.edu> | 2011-02-12 11:48:16 +0000 |
---|---|---|
committer | Janne Grunau <janne-ffmpeg@jannau.net> | 2011-02-13 15:36:39 +0100 |
commit | e6b1ed693ae4098e6b9eabf938fc31ec0b09b120 (patch) | |
tree | 8afa645b29c35cde5a286b29cbab58fbbed4c1ed /libavcodec/mdct.c | |
parent | 3c33c0e26325f189dbf7f212f8e9042feb83bfb0 (diff) | |
download | ffmpeg-e6b1ed693ae4098e6b9eabf938fc31ec0b09b120.tar.gz |
FFT: factor a shuffle out of the inner loop and merge it into fft_permute.
6% faster SSE FFT on Conroe, 2.5% on Penryn.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Diffstat (limited to 'libavcodec/mdct.c')
-rw-r--r-- | libavcodec/mdct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mdct.c b/libavcodec/mdct.c index c511188d22..819f618115 100644 --- a/libavcodec/mdct.c +++ b/libavcodec/mdct.c @@ -71,7 +71,7 @@ av_cold int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) s->mdct_bits = nbits; s->mdct_size = n; n4 = n >> 2; - s->permutation = FF_MDCT_PERM_NONE; + s->mdct_permutation = FF_MDCT_PERM_NONE; if (ff_fft_init(s, s->mdct_bits - 2, inverse) < 0) goto fail; @@ -80,7 +80,7 @@ av_cold int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) if (!s->tcos) goto fail; - switch (s->permutation) { + switch (s->mdct_permutation) { case FF_MDCT_PERM_NONE: s->tsin = s->tcos + n4; tstep = 1; |