Mercurial > hg > qm-dsp
view dsp/segmentation/ClusterMeltSegmenter.h @ 321:f1e6be2de9a5
A threshold (delta) is added in the peak picking parameters structure (PPickParams). It is used as an offset when computing the smoothed detection function. A constructor for the structure PPickParams is also added to set the parameters to 0 when a structure instance is created. Hence programmes using the peak picking parameter structure and which do not set the delta parameter (e.g. QM Vamp note onset detector) won't be affected by the modifications.
Functions modified:
- dsp/onsets/PeakPicking.cpp
- dsp/onsets/PeakPicking.h
- dsp/signalconditioning/DFProcess.cpp
- dsp/signalconditioning/DFProcess.h
author | mathieub <mathieu.barthet@eecs.qmul.ac.uk> |
---|---|
date | Mon, 20 Jun 2011 19:01:48 +0100 |
parents | d5014ab8b0e5 |
children | 175e51ae78eb |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* * ClusterMeltSegmenter.h * * Created by Mark Levy on 23/03/2006. * Copyright 2006 Centre for Digital Music, Queen Mary, University of London. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #include <vector> #include "segment.h" #include "Segmenter.h" #include "hmm/hmm.h" #include "base/Window.h" using std::vector; class Decimator; class ConstantQ; class MFCC; class FFTReal; class ClusterMeltSegmenterParams // defaults are sensible for 11025Hz with 0.2 second hopsize { public: ClusterMeltSegmenterParams() : featureType(FEATURE_TYPE_CONSTQ), hopSize(0.2), windowSize(0.6), fmin(62), fmax(16000), nbins(8), ncomponents(20), nHMMStates(40), nclusters(10), histogramLength(15), neighbourhoodLimit(20) { } feature_types featureType; double hopSize; // in secs double windowSize; // in secs int fmin; int fmax; int nbins; int ncomponents; int nHMMStates; int nclusters; int histogramLength; int neighbourhoodLimit; }; class ClusterMeltSegmenter : public Segmenter { public: ClusterMeltSegmenter(ClusterMeltSegmenterParams params); virtual ~ClusterMeltSegmenter(); virtual void initialise(int samplerate); virtual int getWindowsize(); virtual int getHopsize(); virtual void extractFeatures(const double* samples, int nsamples); void setFeatures(const vector<vector<double> >& f); // provide the features yourself virtual void segment(); // segment into default number of segment-types void segment(int m); // segment into m segment-types int getNSegmentTypes() { return nclusters; } protected: void makeSegmentation(int* q, int len); void extractFeaturesConstQ(const double *, int); void extractFeaturesMFCC(const double *, int); Window<double> *window; FFTReal *fft; ConstantQ* constq; MFCC* mfcc; model_t* model; // the HMM int* q; // the decoded HMM state sequence vector<vector<double> > histograms; feature_types featureType; double hopSize; // in seconds double windowSize; // in seconds // constant-Q parameters int fmin; int fmax; int nbins; int ncoeff; // PCA parameters int ncomponents; // HMM parameters int nHMMStates; // clustering parameters int nclusters; int histogramLength; int neighbourhoodLimit; Decimator *decimator; };