From 144e7f8668166ee1779ad304cc5ac94d8e525529 Mon Sep 17 00:00:00 2001 From: Jamie Bullock Date: Mon, 7 Jan 2013 16:27:15 +0000 Subject: added Ooura implementation to repository --- src/xtract_globals_private.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'src/xtract_globals_private.h') 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 - -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 */ -- cgit v1.2.3