Part of the fft8() function corresponds to the BUTTERFLIES macro,
so use it.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| ... | ... |
@@ -246,21 +246,16 @@ static void fft4(FFTComplex *z) |
| 246 | 246 |
|
| 247 | 247 |
static void fft8(FFTComplex *z) |
| 248 | 248 |
{
|
| 249 |
- FFTDouble t1, t2, t3, t4, t5, t6, t7, t8; |
|
| 249 |
+ FFTDouble t1, t2, t3, t4, t5, t6; |
|
| 250 | 250 |
|
| 251 | 251 |
fft4(z); |
| 252 | 252 |
|
| 253 | 253 |
BF(t1, z[5].re, z[4].re, -z[5].re); |
| 254 | 254 |
BF(t2, z[5].im, z[4].im, -z[5].im); |
| 255 |
- BF(t3, z[7].re, z[6].re, -z[7].re); |
|
| 256 |
- BF(t4, z[7].im, z[6].im, -z[7].im); |
|
| 257 |
- BF(t8, t1, t3, t1); |
|
| 258 |
- BF(t7, t2, t2, t4); |
|
| 259 |
- BF(z[4].re, z[0].re, z[0].re, t1); |
|
| 260 |
- BF(z[4].im, z[0].im, z[0].im, t2); |
|
| 261 |
- BF(z[6].re, z[2].re, z[2].re, t7); |
|
| 262 |
- BF(z[6].im, z[2].im, z[2].im, t8); |
|
| 255 |
+ BF(t5, z[7].re, z[6].re, -z[7].re); |
|
| 256 |
+ BF(t6, z[7].im, z[6].im, -z[7].im); |
|
| 263 | 257 |
|
| 258 |
+ BUTTERFLIES(z[0],z[2],z[4],z[6]); |
|
| 264 | 259 |
TRANSFORM(z[1],z[3],z[5],z[7],sqrthalf,sqrthalf); |
| 265 | 260 |
} |
| 266 | 261 |
|