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/fft.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/fft.c')
| -rw-r--r-- | libavcodec/fft.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/fft.c b/libavcodec/fft.c index 3fd4d279cb..eade76a516 100644 --- a/libavcodec/fft.c +++ b/libavcodec/fft.c @@ -97,6 +97,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) if (!s->tmp_buf) goto fail; s->inverse = inverse; + s->fft_permutation = FF_FFT_PERM_DEFAULT; s->fft_permute = ff_fft_permute_c; s->fft_calc = ff_fft_calc_c; @@ -113,8 +114,12 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) for(j=4; j<=nbits; j++) { ff_init_ff_cos_tabs(j); } - for(i=0; i<n; i++) - s->revtab[-split_radix_permutation(i, n, s->inverse) & (n-1)] = i; + for(i=0; i<n; i++) { + int j = i; + if (s->fft_permutation == FF_FFT_PERM_SWAP_LSBS) + j = (j&~3) | ((j>>1)&1) | ((j<<1)&2); + s->revtab[-split_radix_permutation(i, n, s->inverse) & (n-1)] = j; + } return 0; fail: |