Mercurial > hg > qm-dsp

diff dsp/segmentation/ClusterMeltSegmenter.h @ 251:c3600d3cfe5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Add timbral (MFCC) feature option to segmenter
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 10 Jan 2008 16:41:33 +0000
parents 18a0dffa5c1a
children 6cb2b3cd5356
line wrap: on
line diff
--- a/dsp/segmentation/ClusterMeltSegmenter.h	Thu Jan 10 15:16:08 2008 +0000
+++ b/dsp/segmentation/ClusterMeltSegmenter.h	Thu Jan 10 16:41:33 2008 +0000
@@ -19,6 +19,7 @@
 
 class Decimator;
 class ConstantQ;
+class MFCC;
 
 class ClusterMeltSegmenterParams
 // defaults are sensible for 11025Hz with 0.2 second hopsize
@@ -66,8 +67,12 @@
 protected:
     void makeSegmentation(int* q, int len);
 	
+    void extractFeaturesConstQ(const double *, int);
+    void extractFeaturesMFCC(const double *, int);
+
     Window<double> *window;
-    ConstantQ* constq;	
+    ConstantQ* constq; 
+    MFCC* mfcc;
     model_t* model;				// the HMM
     int* q;					// the decoded HMM state sequence
     vector<vector<double> > histograms;