comparison plugins/BeatTrack.cpp @ 85:2631d0b3d7eb

* Ensure beat tracker, onset detector & tonal change detector return
  results timed from the first input timestamp, not always from zero

     }
     void reset() {
 	delete df;
 	df = new DetectionFunction(dfConfig);
 	dfOutput.clear();
+        origin = Vamp::RealTime::zeroTime;
     }
 
     DFConfig dfConfig;
     DetectionFunction *df;
     vector<double> dfOutput;
+    Vamp::RealTime origin;
 };
     
 
 BeatTracker::BeatTracker(float inputSampleRate) :
     Vamp::Plugin(inputSampleRate),

     return list;
 }
 
 BeatTracker::FeatureSet
 BeatTracker::process(const float *const *inputBuffers,
-                     Vamp::RealTime /* timestamp */)
+                     Vamp::RealTime timestamp)
 {
     if (!m_d) {
 	cerr << "ERROR: BeatTracker::process: "
 	     << "BeatTracker has not been initialised"
 	     << endl;

 
     double output = m_d->df->process(magnitudes, phases);
 
     delete[] magnitudes;
     delete[] phases;
+
+    if (m_d->dfOutput.empty()) m_d->origin = timestamp;
 
     m_d->dfOutput.push_back(output);
 
     FeatureSet returnFeatures;
 

 
 	size_t frame = beats[i] * m_d->dfConfig.stepSize;
 
 	Feature feature;
 	feature.hasTimestamp = true;
-	feature.timestamp = Vamp::RealTime::frame2RealTime
+	feature.timestamp = m_d->origin + Vamp::RealTime::frame2RealTime
 	    (frame, lrintf(m_inputSampleRate));
 
 	float bpm = 0.0;
 	int frameIncrement = 0;
 

 //        std::cerr << "unit " << i << ", step size " << m_d->dfConfig.stepSize << ", hop " << ttParams.lagLength << ", frame = " << frame << std::endl;
         
         if (tempos[i] > 1 && int(tempos[i] * 100) != int(prevTempo * 100)) {
             Feature feature;
             feature.hasTimestamp = true;
-            feature.timestamp = Vamp::RealTime::frame2RealTime
+            feature.timestamp = m_d->origin + Vamp::RealTime::frame2RealTime
                 (frame, lrintf(m_inputSampleRate));
             feature.values.push_back(tempos[i]);
             sprintf(label, "%.2f bpm", tempos[i]);
             feature.label = label;
             returnFeatures[2].push_back(feature); // tempo is output 2