comparison src/vamp-hostsdk/PluginBufferingAdapter.cpp @ 287:f3b1ba71a305

* When calculating timestamps in order to write them into features that
  previously lacked them, from a buffering adapter, we need to take into
  account any timestamp adjustment used by other wrappers that are being
  wrapped by this one (i.e. input domain adapter)

 
 #include <vector>
 #include <map>
 
 #include <vamp-hostsdk/PluginBufferingAdapter.h>
+#include <vamp-hostsdk/PluginInputDomainAdapter.h>
 
 using std::vector;
 using std::map;
 
 _VAMP_SDK_HOSTSPACE_BEGIN(PluginBufferingAdapter.cpp)

     RealTime timestamp = RealTime::frame2RealTime
         (frame, int(m_inputSampleRate + 0.5));
 
     FeatureSet featureSet = m_plugin->process(m_buffers, timestamp);
     
+    PluginWrapper *wrapper = dynamic_cast<PluginWrapper *>(m_plugin);
+    RealTime adjustment;
+    if (wrapper) {
+        PluginInputDomainAdapter *ida =
+            wrapper->getWrapper<PluginInputDomainAdapter>();
+        if (ida) adjustment = ida->getTimestampAdjustment();
+    }
+
     for (FeatureSet::iterator iter = featureSet.begin();
          iter != featureSet.end(); ++iter) {
 
         int outputNo = iter->first;
 

 
                 switch (m_outputs[outputNo].sampleType) {
 
                 case OutputDescriptor::OneSamplePerStep:
                     // use our internal timestamp, always
-                    featureList[i].timestamp = timestamp;
+                    featureList[i].timestamp = timestamp + adjustment;
                     featureList[i].hasTimestamp = true;
                     break;
 
                 case OutputDescriptor::FixedSampleRate:
                     // use our internal timestamp if feature lacks one
                     if (!featureList[i].hasTimestamp) {
-                        featureList[i].timestamp = timestamp;
+                        featureList[i].timestamp = timestamp + adjustment;
                         featureList[i].hasTimestamp = true;
                     }
                     break;
 
                 case OutputDescriptor::VariableSampleRate: