comparison src/vector.c @ 171:661c1c732269

Copy out input values for Ooura so the in-place transform doesn't overwrite *data

 /* xtract_vector.c: defines functions that extract a feature as a single value from an input vector */
 
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #include "fft.h"
 
 #include "../xtract/libxtract.h"
 #include "xtract_macros_private.h"

     double real = 0.0;
     double imag = 0.0;
     unsigned int n = 0;
     unsigned int m = 0;
     unsigned int M = N >> 1;
-#ifndef USE_OOURA
+#ifdef USE_OOURA
+    double *fft = NULL;
+#else 
     DSPDoubleSplitComplex *fft = NULL;
 #endif
 
     q = *(double *)argv;
     vector = (int)*((double *)argv+1);

 #ifdef USE_OOURA
     /* ooura is in-place
      * the output format is
      * a[0] - DC, a[1] - nyquist, a[2...N-1] - remaining bins
      */
-    rdft(N, 1, data, ooura_data_spectrum.ooura_ip, 
+    fft = malloc(N * sizeof(double));
+    assert(fft != NULL);
+    memcpy(fft, data, N * sizeof(double));
+
+    rdft(N, 1, fft, ooura_data_spectrum.ooura_ip, 
             ooura_data_spectrum.ooura_w);
 #else
     fft = &vdsp_data_spectrum.fft;
     vDSP_ctozD((DSPDoubleComplex *)data, 2, fft, 1, N >> 1);
     vDSP_fft_zripD(vdsp_data_spectrum.setup, fft, 1, 

             if(n==1 && withDC) /* discard Nyquist */
             {
                 ++n;
             }
 
-            real = data[n*2];
-            imag = data[n*2+1];
+            real = fft[n*2];
+            imag = fft[n*2+1];
 #else
             real = fft->realp[n];
             imag = fft->realp[n];
 #endif
 

             if(n==1 && withDC) /* discard Nyquist */
             {
                 ++n;
             }
 
-            real = data[n*2];
-            imag = data[n*2+1];
+            real = fft[n*2];
+            imag = fft[n*2+1];
 #else
             real = fft->realp[n];
             imag = fft->realp[n];
 #endif
 

             if(n==1 && withDC) /* discard Nyquist */
             {
                 ++n;
             }
 
-            real = data[n*2];
-            imag = data[n*2+1];
+            real = fft[n*2];
+            imag = fft[n*2+1];
 #else
             real = fft->realp[n];
             imag = fft->realp[n];
 #endif
 

 #ifdef USE_OOURA
             if(n==1 && withDC) /* discard Nyquist */
             {
                 ++n;
             }
-            real = data[n*2];
-            imag = data[n*2+1];
+            real = fft[n*2];
+            imag = fft[n*2+1];
 #else
             real = fft->realp[n];
             imag = fft->realp[n];
 #endif
             *marker = sqrt(XTRACT_SQ(real) + XTRACT_SQ(imag)) / (double)N;

     if(normalise)
     {
         for(n = 0; n < M; n++)
             result[n] /= max;
     }
+
+#ifdef USE_OOURA
+    free(fft);
+#endif
 
     return XTRACT_SUCCESS;
 }
 
 int xtract_autocorrelation_fft(const double *data, const int N, const void *argv, double *result)

             result[n] = 0;
             result[N + n] = 0;
         }
     }
 
-    free(input);
+   // free(input);
     return (rv ? rv : XTRACT_SUCCESS);
 }
 
 int xtract_harmonic_spectrum(const double *data, const int N, const void *argv, double *result)
 {