comparison Source/FFTW.h @ 4:345acbd06029

Vectorised most things to make lifer easier. Still no debug version though. Weird.

 
 #pragma once
 
 #include "fftw3.h"
 #include <vector>
+#include <memory>
 #include <stdio.h>
 //#include <windows.h>
 #include <string.h>
 //#include <itl/dsp/SimdTools.h>
 

   FFTW();
   FFTW( unsigned fftLength )
   {
 	m_iFFTSize = fftLength;
 
-    float* tempInput = new float[fftLength];
-	memset(tempInput,0, fftLength * sizeof(float));
-    float* tempReal  = new float[fftLength];
-	memset(tempReal,0, fftLength * sizeof(float));
-    float* tempImag  = new float[fftLength];
-	memset(tempImag,0, fftLength * sizeof(float));
+	std::vector<float> tempInput = std::vector<float>(fftLength, 0);
+	std::vector<float> tempReal = std::vector<float>(fftLength, 0);
+	std::vector<float> tempImag = std::vector<float>(fftLength, 0);
+
+
     fftwf_iodim  dim;
     dim.n =  fftLength;
     dim.is = 1;
     dim.os = 1;
-    m_plan = fftwf_plan_guru_split_dft_r2c( 1, &dim, 0, nullptr, tempInput, tempReal, tempImag, FFTW_ESTIMATE );
-	delete[] tempInput;
-	tempInput = nullptr;
-	delete[] tempReal;
-	tempReal = nullptr;
-	delete[] tempImag;
-	tempImag = nullptr;
+    m_plan = fftwf_plan_guru_split_dft_r2c( 1, &dim, 0, nullptr, tempInput.data(), tempReal.data(), tempImag.data(), FFTW_ESTIMATE );
   }
 
 
  ~FFTW()
   {

 			fftwf_destroy_plan( m_plan );
 	  }
   }
 
 
-  void process( const float* input , float* realPart , float* imagPart )
+ void process(std::vector<float> input, std::vector<float> &realPart, std::vector<float> &imagPart)
   {
-	float* nonConstInput =  const_cast<float*>(input);   // fftw does not take const input even though the data not be manipulated!
-
-	fftwf_execute_split_dft_r2c( m_plan, nonConstInput, realPart, imagPart);
+	
+	fftwf_execute_split_dft_r2c( m_plan, input.data(), realPart.data(), imagPart.data());
 
 	//Multiply results by 2 to match the iOS output
 	for(size_t i = 0; i < m_iFFTSize; i++)
 	{
 		realPart[i] *= 2.f;