comparison dsp/segmentation/ClusterMeltSegmenter.cpp @ 64:6cb2b3cd5356

* 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)

 #include "dsp/rateconversion/Decimator.h"
 #include "dsp/mfcc/MFCC.h"
 
 ClusterMeltSegmenter::ClusterMeltSegmenter(ClusterMeltSegmenterParams params) :
     window(NULL),
+    fft(NULL),
     constq(NULL),
     mfcc(NULL),
     featureType(params.featureType),
     hopSize(params.hopSize),
     windowSize(params.windowSize),

 
         constq = new ConstantQ(config);
         constq->sparsekernel();
         
         ncoeff = constq->getK();
+
+        fft = new FFTReal(constq->getfftlength());
         
     } else if (featureType == FEATURE_TYPE_MFCC) {
 
         // run internal processing at 22050 or thereabouts
         int internalRate = 22050;

 ClusterMeltSegmenter::~ClusterMeltSegmenter() 
 {
     delete window;
     delete constq;
     delete decimator;
+    delete fft;
 }
 
 int
 ClusterMeltSegmenter::getWindowsize()
 {

             frame[i + fftsize/2] = value;
         }
 
         window->cut(frame);
         
-        FFT::process(fftsize, false, frame, 0, real, imag);
+        fft->process(false, frame, real, imag);
         
         constq->process(real, imag, cqre, cqim);
 	
         for (int i = 0; i < ncoeff; ++i) {
             cq[i] += sqrt(cqre[i] * cqre[i] + cqim[i] * cqim[i]);