From 9c106a6004ffcfb55f0036535982fb118a3b2718 Mon Sep 17 00:00:00 2001 From: Jamie Bullock Date: Wed, 9 Jan 2013 23:09:34 +0000 Subject: implemented optimised FFT via the Accelerate framework. closes #5 --- src/xtract_globals_private.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/xtract_globals_private.h') diff --git a/src/xtract_globals_private.h b/src/xtract_globals_private.h index b7c26e4..e643ab0 100644 --- a/src/xtract_globals_private.h +++ b/src/xtract_globals_private.h @@ -26,12 +26,7 @@ #ifndef XTRACT_GLOBALS_PRIVATE_H #define XTRACT_GLOBALS_PRIVATE_H -typedef struct xtract_ooura_data_ -{ - int *ooura_ip; - double *ooura_w; - bool initialised; -} xtract_ooura_data; +#include "fft.h" #ifdef DEFINE_GLOBALS #define GLOBAL @@ -39,10 +34,17 @@ typedef struct xtract_ooura_data_ #define GLOBAL extern #endif +#ifdef USE_OOURA 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; +#else +GLOBAL xtract_vdsp_data vdsp_data_dct; +GLOBAL xtract_vdsp_data vdsp_data_mfcc; +GLOBAL xtract_vdsp_data vdsp_data_spectrum; +GLOBAL xtract_vdsp_data vdsp_data_autocorrelation_fft; +#endif #endif /* Header guard */ -- cgit v1.2.3