diff dsp/segmentation/ClusterMeltSegmenter.cpp @ 255:9edaa3ce62e8

* Make MFCC able to accept already-FFT'd input, and simplify API a bit * Add log power value to MFCC, restore windowing, and avoid some heap allocs * In HMM, bail out of iteration if loglik hits NaN
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 18 Jan 2008 13:24:12 +0000
parents 89a2b34a098f
children 00603b8a940f
line wrap: on
line diff
--- a/dsp/segmentation/ClusterMeltSegmenter.cpp	Wed Jan 16 18:02:31 2008 +0000
+++ b/dsp/segmentation/ClusterMeltSegmenter.cpp	Fri Jan 18 13:24:12 2008 +0000
@@ -92,8 +92,7 @@
             decimator = new Decimator(getWindowsize(), decimationFactor);
         }
 
-        MFCCConfig config;
-        config.FS = samplerate / decimationFactor;
+        MFCCConfig config(samplerate / decimationFactor);
         config.fftsize = 2048;
         config.nceps = 19;
         config.want_c0 = true;
@@ -278,7 +277,7 @@
             }
         }
 
-        mfcc->process(fftsize, frame, ccout);
+        mfcc->process(frame, ccout);
 	
         for (int i = 0; i < ncoeff; ++i) {
             cc[i] += ccout[i];