Mercurial > hg > vamp-tempogram

diff Tempogram.h @ 4:597f033fa7a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Some cleaning and rearranging to prepare for band processing implementation
author Carl Bussey <c.bussey@se10.qmul.ac.uk>
date Tue, 05 Aug 2014 15:56:59 +0100
parents 5125d34fda67
children 21147df9cb2d
line wrap: on
line diff
--- a/Tempogram.h	Wed Jul 09 20:14:20 2014 +0100
+++ b/Tempogram.h	Tue Aug 05 15:56:59 2014 +0100
@@ -45,7 +45,6 @@
     bool initialise(size_t channels, size_t stepSize, size_t blockSize);
     void initialiseForGRF();
     void cleanupForGRF();
-    vector<float> spectrogramToNoveltyCurve(vector<float> spectrogramData, int numberOfBlocks, int blockSize, float samplingFrequency, FeatureSet * featureSet = NULL);
     void reset();
 
     FeatureSet process(const float *const *inputBuffers,
@@ -61,7 +60,8 @@
     float specMax;
     float *previousY;
     float *currentY;
-    vector<float> specData;
+    vector< vector<float> > specData;
+    float ** spectrogram;
     vector<float> noveltyCurve;
     float minDB;
     
@@ -72,8 +72,6 @@
     double * fftOutputImag;
     
     int numberOfBlocks;
-    int hannN;
-    float *hannWindow;
     float *hannWindowtN;
     
     vector<Vamp::RealTime> ncTimestamps;