Mercurial > hg > vamp-tempogram

diff TempogramPlugin.cpp @ 24:957b83524c06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Replacing loop unsigned ints with ints
author Carl Bussey <c.bussey@se10.qmul.ac.uk>
date Tue, 19 Aug 2014 18:20:26 +0100
parents 7d36c742a183
children fe23998968b4
line wrap: on
line diff
--- a/TempogramPlugin.cpp	Tue Aug 19 17:40:10 2014 +0100
+++ b/TempogramPlugin.cpp	Tue Aug 19 18:20:26 2014 +0100
@@ -385,6 +385,7 @@
     m_inputBlockSize = blockSize;
     m_inputStepSize = stepSize;
     
+    //m_spectrogram = Spectrogram(m_inputBlockSize/2 + 1);
     if (!handleParameterValues()) return false;
     //cout << m_cyclicTempogramOctaveDivider << endl;
     
@@ -414,6 +415,7 @@
         fftCoefficients.push_back(magnitude);
     }
     m_spectrogram.push_back(fftCoefficients);
+    //m_spectrogram.push_back(fftCoefficients);
     
     return FeatureSet();
 }
@@ -434,7 +436,6 @@
     //cerr << numberOfBlocks << endl;
     NoveltyCurveProcessor nc(m_inputSampleRate, m_inputBlockSize, m_noveltyCurveCompressionConstant);
     vector<float> noveltyCurve = nc.spectrogramToNoveltyCurve(m_spectrogram); //calculate novelty curvefrom magnitude data
-    //if(noveltyCurve.size() > 50) for (int i = 0; i < 50; i++) cerr << noveltyCurve[i] << endl;
     
     //push novelty curve data to featureset 1 and set timestamps
     for (int i = 0; i < numberOfBlocks; i++){