Mercurial > hg > qm-dsp
diff dsp/segmentation/Segmenter.h @ 480:175e51ae78eb
Untabify, indent, tidy
author | Chris Cannam <cannam@all-day-breakfast.com> |
---|---|
date | Fri, 31 May 2019 10:53:39 +0100 |
parents | d5014ab8b0e5 |
children | d48276a3ae24 |
line wrap: on
line diff
--- a/dsp/segmentation/Segmenter.h Fri May 31 10:35:08 2019 +0100 +++ b/dsp/segmentation/Segmenter.h Fri May 31 10:53:39 2019 +0100 @@ -25,17 +25,17 @@ class Segment { public: - int start; // in samples - int end; - int type; + int start; // in samples + int end; + int type; }; class Segmentation { public: - int nsegtypes; // number of segment types, so possible types are {0,1,...,nsegtypes-1} - int samplerate; - vector<Segment> segments; + int nsegtypes; // number of segment types, so possible types are {0,1,...,nsegtypes-1} + int samplerate; + vector<Segment> segments; }; ostream& operator<<(ostream& os, const Segmentation& s); @@ -43,20 +43,20 @@ class Segmenter { public: - Segmenter() {} - virtual ~Segmenter() {} - virtual void initialise(int samplerate) = 0; // must be called before any other methods - virtual int getWindowsize() = 0; // required window size for calls to extractFeatures() - virtual int getHopsize() = 0; // required hop size for calls to extractFeatures() - virtual void extractFeatures(const double* samples, int nsamples) = 0; - virtual void segment() = 0; // call once all the features have been extracted - virtual void segment(int m) = 0; // specify desired number of segment-types - virtual void clear() { features.clear(); } - const Segmentation& getSegmentation() const { return segmentation; } + Segmenter() {} + virtual ~Segmenter() {} + virtual void initialise(int samplerate) = 0; // must be called before any other methods + virtual int getWindowsize() = 0; // required window size for calls to extractFeatures() + virtual int getHopsize() = 0; // required hop size for calls to extractFeatures() + virtual void extractFeatures(const double* samples, int nsamples) = 0; + virtual void segment() = 0; // call once all the features have been extracted + virtual void segment(int m) = 0; // specify desired number of segment-types + virtual void clear() { features.clear(); } + const Segmentation& getSegmentation() const { return segmentation; } protected: - vector<vector<double> > features; - Segmentation segmentation; - int samplerate; + vector<vector<double> > features; + Segmentation segmentation; + int samplerate; }; #endif