comparison VampTestPlugin.cpp @ 19:534b001d8e8f

Switch to a feature that permits drawing some conclusions about the input data having arrived in the right order

 
 
 #include "VampTestPlugin.h"
 
+#include <iostream>
 #include <sstream>
 #include <cmath>
 
-using std::stringstream;
+using namespace std;
 
 using Vamp::RealTime;
 
 VampTestPlugin::VampTestPlugin(float inputSampleRate) :
     Plugin(inputSampleRate),

     d.sampleRate = 0;
     d.hasDuration = true;
     m_outputNumbers[d.identifier] = n++;
     list.push_back(d);
 
-    d.identifier = "rmss";
-    d.name = "RMS of Input Channels";
-    d.description = "RMS levels of each input channel";
+    d.identifier = "input-summary";
+    d.name = "Data derived from inputs";
+    d.description = "One-sample-per-step features with n values, where n is the number of input channels. Each feature contains, for each input channel, the first sample value on that channel plus the total number of non-zero samples on that channel";
     d.unit = "";
     d.hasFixedBinCount = true;
     d.binCount = m_channels;
     d.hasKnownExtents = false;
     d.isQuantized = false;

 }
 
 static Vamp::Plugin::Feature
 instant(RealTime r, int i, int n)
 {
-    std::stringstream s;
+    stringstream s;
     Vamp::Plugin::Feature f;
     f.hasTimestamp = true;
     f.timestamp = r;
     f.hasDuration = false;
     s << i+1 << " of " << n << " at " << r.toText();

 }
 
 static Vamp::Plugin::Feature
 untimedCurveValue(RealTime r, int i, int n)
 {
-    std::stringstream s;
+    stringstream s;
     Vamp::Plugin::Feature f;
     f.hasTimestamp = false;
     f.hasDuration = false;
     float v = float(i) / float(n);
     f.values.push_back(v);

 }
 
 static Vamp::Plugin::Feature
 timedCurveValue(RealTime r, int i, int n)
 {
-    std::stringstream s;
+    stringstream s;
     Vamp::Plugin::Feature f;
     f.hasTimestamp = true;
     f.timestamp = r;
     f.hasDuration = false;
     float v = float(i) / float(n);

 }
 
 static Vamp::Plugin::Feature
 snappedCurveValue(RealTime r, RealTime sn, int i, int n)
 {
-    std::stringstream s;
+    stringstream s;
     Vamp::Plugin::Feature f;
     f.hasTimestamp = true;
     f.timestamp = r;
     f.hasDuration = false;
     float v = float(i) / float(n);

 }
 
 static Vamp::Plugin::Feature
 gridColumn(RealTime r, int i, int n)
 {
-    std::stringstream s;
+    stringstream s;
     Vamp::Plugin::Feature f;
     f.hasTimestamp = false;
     f.hasDuration = false;
     for (int j = 0; j < 10; ++j) {
 	float v = float(j + i + 2) / float(n + 10);

 }
 
 static Vamp::Plugin::Feature
 noteOrRegion(RealTime r, RealTime d, int i, int n)
 {
-    std::stringstream s;
+    stringstream s;
     Vamp::Plugin::Feature f;
     f.hasTimestamp = true;
     f.timestamp = r;
     f.hasDuration = true;
     f.duration = d;

     if (!m_produceOutput) return FeatureSet();
     FeatureSet fs = featuresFrom(timestamp, false);
 
     Feature f;
     for (int c = 0; c < m_channels; ++c) {
-	float sum = 0.f;
+	// first value plus number of non-zero values
+	float sum = inputBuffers[c][0];
 	for (int i = 0; i < m_blockSize; ++i) {
-	    sum += inputBuffers[c][i] * inputBuffers[c][i];
-	}
-	float rms = sqrtf(sum / m_blockSize);
-	f.values.push_back(rms);
-    }
-    fs[m_outputNumbers["rmss"]].push_back(f);
+	    if (inputBuffers[c][i] != 0.f) sum += 1;
+	}
+	f.values.push_back(sum);
+    }
+    fs[m_outputNumbers["input-summary"]].push_back(f);
     
     return fs;
 }
 
 VampTestPlugin::FeatureSet