comparison src/init.c @ 164:7a23234648b4

Pass block size to xtract_init_vdsp_data() instead of block size / 2. Fixes bug with erroneous values in second half of spectrum when using vDSP FFT

 #else
 
 void xtract_init_vdsp_data(xtract_vdsp_data *vdsp_data, unsigned int N)
 {
     vdsp_data->setup = vDSP_create_fftsetupD(log2f(N), FFT_RADIX2);
-    vdsp_data->fft.realp = (double *) malloc((N >> 1) * sizeof(double));
-    vdsp_data->fft.imagp = (double *) malloc((N >> 1) * sizeof(double));
+    vdsp_data->fft.realp = (double *) malloc((N >> 1) * sizeof(double) + 1);
+    vdsp_data->fft.imagp = (double *) malloc((N >> 1) * sizeof(double) + 1);
     vdsp_data->log2N = log2f(N);
     vdsp_data->initialised = true;
 }
 
 void xtract_free_vdsp_data(xtract_vdsp_data *vdsp_data)

     vdsp_data->initialised = false;
 }
 
 int xtract_init_vdsp_(int N, int feature_name)
 {
-
-    int M = N >> 1;
-
-    if(feature_name == XTRACT_AUTOCORRELATION_FFT)
-    {
-        M = N; /* allow for zero padding */
-    }
-
     switch(feature_name)
     {
     case XTRACT_SPECTRUM:
         if(vdsp_data_spectrum.initialised)
         {
             xtract_free_vdsp_data(&vdsp_data_spectrum);
         }
-        xtract_init_vdsp_data(&vdsp_data_spectrum, M);
+        xtract_init_vdsp_data(&vdsp_data_spectrum, N);
         break;
     case XTRACT_AUTOCORRELATION_FFT:
         if(vdsp_data_autocorrelation_fft.initialised)
         {
             xtract_free_vdsp_data(&vdsp_data_autocorrelation_fft);
         }
-        xtract_init_vdsp_data(&vdsp_data_autocorrelation_fft, M);
+        xtract_init_vdsp_data(&vdsp_data_autocorrelation_fft, N * 2); // allow for zero padding
         break;
     case XTRACT_DCT:
         if(vdsp_data_dct.initialised)
         {
             xtract_free_vdsp_data(&vdsp_data_dct);
         }
-        xtract_init_vdsp_data(&vdsp_data_dct, M);
+        xtract_init_vdsp_data(&vdsp_data_dct, N);
     case XTRACT_MFCC:
         if(vdsp_data_mfcc.initialised)
         {
             xtract_free_vdsp_data(&vdsp_data_mfcc);
         }
-        xtract_init_vdsp_data(&vdsp_data_mfcc, M);
+        xtract_init_vdsp_data(&vdsp_data_mfcc, N);
         break;
     }
 
     return XTRACT_SUCCESS;
 }