aboutsummaryrefslogtreecommitdiff
path: root/common/fft.h
diff options
context:
space:
mode:
authorMatthew Hoops2012-04-19 08:16:08 -0400
committerMatthew Hoops2012-04-19 08:16:24 -0400
commit9971e74c4c481f99401212b469e9c79185fa6e70 (patch)
treec45fe6d57cc35557e3c7ceb90b1e6f3edeb3aa2f /common/fft.h
parent5ee569bce634d6704703239e665d865afc4e48fb (diff)
parent4520b115e97b494bd5d13599f27a5a339465f88e (diff)
downloadscummvm-rg350-9971e74c4c481f99401212b469e9c79185fa6e70.tar.gz
scummvm-rg350-9971e74c4c481f99401212b469e9c79185fa6e70.tar.bz2
scummvm-rg350-9971e74c4c481f99401212b469e9c79185fa6e70.zip
Merge remote branch 'upstream/master' into pegasus
Conflicts: base/plugins.cpp configure
Diffstat (limited to 'common/fft.h')
-rw-r--r--common/fft.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/common/fft.h b/common/fft.h
index e77c53c2a7..bc58f1dded 100644
--- a/common/fft.h
+++ b/common/fft.h
@@ -34,6 +34,8 @@
namespace Common {
+class CosineTable;
+
/**
* (Inverse) Fast Fourier Transform.
*
@@ -64,13 +66,17 @@ private:
Complex *_expTab;
Complex *_tmpBuf;
- const float *_tSin;
- const float *_tCos;
-
int _splitRadix;
int _permutation;
static int splitRadixPermutation(int i, int n, int inverse);
+
+ CosineTable *_cosTables[13];
+
+ void fft4(Complex *z);
+ void fft8(Complex *z);
+ void fft16(Complex *z);
+ void fft(int n, int logn, Complex *z);
};
} // End of namespace Common