diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2011-02-12 11:48:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-14 23:58:19 +0100 |
| commit | 11ab1e409ff272c8c0bce62f48a3767546547c6c (patch) | |
| tree | 611275effddbe66a5075439fedf578c32c7b6463 /libavcodec/mdct.c | |
| parent | 709946b34ca51518da7dd01c124a0530fa56f8c7 (diff) | |
| download | ffmpeg-11ab1e409ff272c8c0bce62f48a3767546547c6c.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>
(cherry picked from commit e6b1ed693ae4098e6b9eabf938fc31ec0b09b120)
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; |