diff options
| author | Jamie Bullock <jamie@jamiebullock.com> | 2013-01-07 16:27:15 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@jamiebullock.com> | 2013-01-07 16:39:29 +0000 |
| commit | 144e7f8668166ee1779ad304cc5ac94d8e525529 (patch) | |
| tree | 089b2bbbcf15ee8bdde390a4d270e4812e7e2228 /src/xtract_globals_private.h | |
| parent | 0f46938156dedf13032bdb1fc914a63d46bae558 (diff) | |
| download | LibXtract-144e7f8668166ee1779ad304cc5ac94d8e525529.tar.gz LibXtract-144e7f8668166ee1779ad304cc5ac94d8e525529.tar.bz2 LibXtract-144e7f8668166ee1779ad304cc5ac94d8e525529.zip | |
added Ooura implementation to repository
Diffstat (limited to 'src/xtract_globals_private.h')
| -rw-r--r-- | src/xtract_globals_private.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/xtract_globals_private.h b/src/xtract_globals_private.h index cab1660..d280985 100644 --- a/src/xtract_globals_private.h +++ b/src/xtract_globals_private.h @@ -23,17 +23,12 @@ #ifndef XTRACT_GLOBALS_PRIVATE_H #define XTRACT_GLOBALS_PRIVATE_H -#ifdef XTRACT_FFT -#include <fftw3.h> - -struct xtract_fft_plans_ { - - fftwf_plan spectrum_plan; - fftwf_plan autocorrelation_fft_plan_1; - fftwf_plan autocorrelation_fft_plan_2; - fftwf_plan dct_plan; - -}; +typedef struct xtract_ooura_data_ +{ + int *ooura_ip; + double *ooura_w; + bool initialised; +} xtract_ooura_data; #ifdef DEFINE_GLOBALS #define GLOBAL @@ -41,9 +36,10 @@ struct xtract_fft_plans_ { #define GLOBAL extern #endif -GLOBAL struct xtract_fft_plans_ fft_plans; - -#endif /* FFT */ +GLOBAL struct xtract_ooura_data_ ooura_data_dct; +GLOBAL struct xtract_ooura_data_ ooura_data_mfcc; +GLOBAL struct xtract_ooura_data_ ooura_data_spectrum; +GLOBAL struct xtract_ooura_data_ ooura_data_autocorrelation_fft; #endif /* Header guard */ |