comparison dsp/mfcc/MFCC.cpp @ 289:befe5aa6b450

* Refactor FFT a little bit so as to separate construction and processing
  rather than have a single static method -- will make it easier to use a
  different implementation
* pull in KissFFT implementation (not hooked up yet)

     logFilters        = 27;
     logSpacing        = 1.0711703;
   
     /* FFT and analysis window sizes */
     fftSize           = config.fftsize;
+    fft               = new FFTReal(fftSize);
 
     totalFilters      = linearFilters + logFilters;
     logPower          = config.logpower;
   
     samplingRate      = config.FS;

    
     /* The analysis window */
     window      = new Window<double>(config.window, fftSize);
 
     /* Allocate memory for the FFT */
-    imagIn      = (double*)calloc(fftSize, sizeof(double));
     realOut     = (double*)calloc(fftSize, sizeof(double));
     imagOut     = (double*)calloc(fftSize, sizeof(double));
 
     earMag      = (double*)calloc(totalFilters, sizeof(double));
     fftMag      = (double*)calloc(fftSize/2, sizeof(double));

 
     free(earMag);
     free(fftMag);
     
     /* Free the FFT */
-    free(imagIn);
     free(realOut);
     free(imagOut);
+
+    delete fft;
 }
 
 
 /*
  * 

     for (int i = 0; i < fftSize; ++i) inputData[i] = inframe[i];
 
     window->cut(inputData);
   
     /* Calculate the fft on the input frame */
-    FFT::process(fftSize, 0, inputData, imagIn, realOut, imagOut);
+    fft->process(0, inputData, realOut, imagOut);
 
     free(inputData);
 
     return process(realOut, imagOut, outceps);
 }