comparison src/vamp-hostsdk/PluginInputDomainAdapter.cpp @ 288:283e15f6e548

* The beginnings of making the shift-timestamp or shift-data behaviour
  of PluginInputDomainAdapter into an option

 public:
     Impl(Plugin *plugin, float inputSampleRate);
     ~Impl();
     
     bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+    void reset();
 
     size_t getPreferredStepSize() const;
     size_t getPreferredBlockSize() const;
 
     FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+
+    void setProcessTimestampMethod(ProcessTimestampMethod m);
+    ProcessTimestampMethod getProcessTimestampMethod() const;
     
     RealTime getTimestampAdjustment() const;
 
 protected:
     Plugin *m_plugin;
     float m_inputSampleRate;
     int m_channels;
+    int m_stepSize;
     int m_blockSize;
     float **m_freqbuf;
 
     double *m_ri;
     double *m_window;
+
+    ProcessTimestampMethod m_method;
+    int m_processCount;
+    FeatureSet prepadProcess(const float *const *inputBuffers,
+                             RealTime timestamp);
 
 #ifdef HAVE_FFTW3
     fftw_plan m_plan;
     fftw_complex *m_cbuf;
 #else

 PluginInputDomainAdapter::initialise(size_t channels, size_t stepSize, size_t blockSize)
 {
     return m_impl->initialise(channels, stepSize, blockSize);
 }
 
+void
+PluginInputDomainAdapter::reset()
+{
+    m_impl->reset();
+}
+
 Plugin::InputDomain
 PluginInputDomainAdapter::getInputDomain() const
 {
     return TimeDomain;
 }

 
 Plugin::FeatureSet
 PluginInputDomainAdapter::process(const float *const *inputBuffers, RealTime timestamp)
 {
     return m_impl->process(inputBuffers, timestamp);
+}
+
+void
+PluginInputDomainAdapter::setProcessTimestampMethod(ProcessTimestampMethod m)
+{
+    m_impl->setProcessTimestampMethod(m);
+}
+
+PluginInputDomainAdapter::ProcessTimestampMethod
+PluginInputDomainAdapter::getProcessTimestampMethod() const
+{
+    return m_impl->getProcessTimestampMethod();
 }
 
 RealTime
 PluginInputDomainAdapter::getTimestampAdjustment() const
 {

 
 PluginInputDomainAdapter::Impl::Impl(Plugin *plugin, float inputSampleRate) :
     m_plugin(plugin),
     m_inputSampleRate(inputSampleRate),
     m_channels(0),
+    m_stepSize(0),
     m_blockSize(0),
     m_freqbuf(0),
     m_ri(0),
     m_window(0),
+    m_method(ShiftTimestamp),
+    m_processCount(0),
 #ifdef HAVE_FFTW3
     m_plan(0),
     m_cbuf(0)
 #else
     m_ro(0),

 bool
 PluginInputDomainAdapter::Impl::initialise(size_t channels, size_t stepSize, size_t blockSize)
 {
     if (m_plugin->getInputDomain() == TimeDomain) {
 
+        m_stepSize = int(stepSize);
         m_blockSize = int(blockSize);
         m_channels = int(channels);
 
         return m_plugin->initialise(channels, stepSize, blockSize);
     }

         delete[] m_io;
 #endif
         delete[] m_window;
     }
 
+    m_stepSize = int(stepSize);
     m_blockSize = int(blockSize);
     m_channels = int(channels);
 
     m_freqbuf = new float *[m_channels];
     for (int c = 0; c < m_channels; ++c) {

     m_ri = new double[m_blockSize];
     m_ro = new double[m_blockSize];
     m_io = new double[m_blockSize];
 #endif
 
+    m_processCount = 0;
+
     return m_plugin->initialise(channels, stepSize, blockSize);
+}
+
+void
+PluginInputDomainAdapter::Impl::reset()
+{
+    m_processCount = 0;
+    m_plugin->reset();
 }
 
 size_t
 PluginInputDomainAdapter::Impl::getPreferredStepSize() const
 {

         return RealTime::zeroTime;
     } else {
         return RealTime::frame2RealTime
             (m_blockSize/2, int(m_inputSampleRate + 0.5));
     }
+}
+
+void
+PluginInputDomainAdapter::Impl::setProcessTimestampMethod(ProcessTimestampMethod m)
+{
+    m_method = m;
+}
+
+PluginInputDomainAdapter::ProcessTimestampMethod
+PluginInputDomainAdapter::Impl::getProcessTimestampMethod() const
+{
+    return m_method;
 }
 
 Plugin::FeatureSet
 PluginInputDomainAdapter::Impl::process(const float *const *inputBuffers,
                                         RealTime timestamp)

     // particular that this means some results can differ from those
     // produced by SV.
 
 //    std::cerr << "PluginInputDomainAdapter: sampleRate " << m_inputSampleRate << ", blocksize " << m_blockSize << ", adjusting time from " << timestamp;
 
-    timestamp = timestamp + getTimestampAdjustment();
+    //!!! update the above comment for ProcessTimestampMethod
+
+    FeatureSet fs;
+    if (m_method == ShiftTimestamp) {
+        timestamp = timestamp + getTimestampAdjustment();
+    } else if (m_processCount == 0) {
+        fs = prepadProcess(inputBuffers, timestamp);
+    }
+    ++m_processCount;
 
 //    std::cerr << " to " << timestamp << std::endl;
 
     for (int c = 0; c < m_channels; ++c) {
 

         }
 
 #endif
     }
 
-    return m_plugin->process(m_freqbuf, timestamp);
+    FeatureSet pfs(m_plugin->process(m_freqbuf, timestamp));
+
+    if (!fs.empty()) { // add any prepad results back in
+        for (FeatureSet::const_iterator i = pfs.begin(); i != pfs.end(); ++i) {
+            for (FeatureList::const_iterator j = i->second.begin();
+                 j != i->second.end(); ++j) {
+                fs[i->first].push_back(*j);
+            }
+        }
+        pfs = fs;
+    }
+
+    return pfs;
+}
+
+Plugin::FeatureSet
+PluginInputDomainAdapter::Impl::prepadProcess(const float *const *inputBuffers,
+                                              RealTime timestamp)
+{
+    FeatureSet fs;
+    //!!!
+    return fs;
 }
 
 #ifndef HAVE_FFTW3
 
 void