Mercurial > hg > vamp-tempogram

diff Tempogram.h @ 3:5125d34fda67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Implemented normalisation * Implemented threshold * Strated implementing bandpass processing
author Carl Bussey <c.bussey@se10.qmul.ac.uk>
date Wed, 09 Jul 2014 20:14:20 +0100
parents 3fd1a41b089b
children 597f033fa7a2
line wrap: on
line diff
--- a/Tempogram.h	Wed Jul 09 14:32:32 2014 +0100
+++ b/Tempogram.h	Wed Jul 09 20:14:20 2014 +0100
@@ -45,6 +45,7 @@
     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,
@@ -57,9 +58,12 @@
     size_t m_blockSize;
     size_t m_stepSize;
     float compressionConstant;
+    float specMax;
     float *previousY;
     float *currentY;
+    vector<float> specData;
     vector<float> noveltyCurve;
+    float minDB;
     
     unsigned int tN;
     unsigned int thopSize;
@@ -67,7 +71,7 @@
     double * fftOutputReal;
     double * fftOutputImag;
     
-    int ncLength;
+    int numberOfBlocks;
     int hannN;
     float *hannWindow;
     float *hannWindowtN;