comparison examples/SpectralCentroid.cpp @ 47:be8fdfe25693

* Change input buffers arg to process from float ** to const float *const *
  to avoid plugins modifying their input data
* Some improvements to comments
* Fix stupidity in frequency-domain input passing (there are n/2+1 values,
  not n/2)

 
     return list;
 }
 
 SpectralCentroid::FeatureSet
-SpectralCentroid::process(float **inputBuffers, Vamp::RealTime)
+SpectralCentroid::process(const float *const *inputBuffers, Vamp::RealTime)
 {
     if (m_stepSize == 0) {
 	cerr << "ERROR: SpectralCentroid::process: "
 	     << "SpectralCentroid has not been initialised"
 	     << endl;
 	return FeatureSet();
     }
 
     double numLin = 0.0, numLog = 0.0, denom = 0.0;
 
-    for (size_t i = 1; i < m_blockSize/2; ++i) {
+    for (size_t i = 1; i <= m_blockSize/2; ++i) {
 	double freq = (double(i) * m_inputSampleRate) / m_blockSize;
 	double real = inputBuffers[0][i*2];
 	double imag = inputBuffers[0][i*2 + 1];
 	double power = sqrt(real * real + imag * imag) / (m_blockSize/2);
 	numLin += freq * power;

 //    std::cerr << "power " << denom << ", block size " << m_blockSize << std::endl;
 
     if (denom != 0.0) {
 	float centroidLin = float(numLin / denom);
 	float centroidLog = powf(10, float(numLog / denom));
+
 	Feature feature;
 	feature.hasTimestamp = false;
-	feature.values.push_back(centroidLog);
+        if (!isnan(centroidLog) && !isinf(centroidLog)) {
+            feature.values.push_back(centroidLog);
+        }
 	returnFeatures[0].push_back(feature);
+
         feature.values.clear();
-	feature.values.push_back(centroidLin);
+        if (!isnan(centroidLin) && !isinf(centroidLin)) {
+            feature.values.push_back(centroidLin);
+        }
 	returnFeatures[1].push_back(feature);
     }
 
     return returnFeatures;
 }