comparison vamp-sdk/PluginAdapter.cpp @ 167:31eda4b11f2b

* First bit of Vamp v2 work -- add an optional duration to features in
  a backward compatible way.

  Warning: this code is unstable and experimental and may change
  significantly in the coming weeks.

 
 protected:
     PluginAdapterBase *m_base;
 
     static VampPluginHandle vampInstantiate(const VampPluginDescriptor *desc,
-                                          float inputSampleRate);
+                                            float inputSampleRate);
 
     static void vampCleanup(VampPluginHandle handle);
 
     static int vampInitialise(VampPluginHandle handle, unsigned int channels,
                              unsigned int stepSize, unsigned int blockSize);

                 if (list[i].features[j].values) {
                     free(list[i].features[j].values);
                 }
             }
             if (list[i].features) free(list[i].features);
+            if (list[i].featuresV2) free(list[i].featuresV2);
         }
         m_fs.erase(plugin);
         m_fsizes.erase(plugin);
         m_fvsizes.erase(plugin);
     }

     return convertFeatures(plugin, plugin->getRemainingFeatures());
 }
 
 VampFeatureList *
 PluginAdapterBase::Impl::convertFeatures(Plugin *plugin,
-                                   const Plugin::FeatureSet &features)
+                                         const Plugin::FeatureSet &features)
 {
     int lastN = -1;
 
     int outputCount = 0;
     if (m_pluginOutputs[plugin]) outputCount = m_pluginOutputs[plugin]->size();

             feature->hasTimestamp = fl[j].hasTimestamp;
             feature->sec = fl[j].timestamp.sec;
             feature->nsec = fl[j].timestamp.nsec;
             feature->valueCount = fl[j].values.size();
 
+            VampFeatureV2 *v2 = &fs[n].featuresV2[j];
+            
+            v2->hasDuration = fl[j].hasDuration;
+            v2->durationSec = fl[j].duration.sec;
+            v2->durationNsec = fl[j].duration.nsec;
+
             if (feature->label) free(feature->label);
 
             if (fl[j].label.empty()) {
                 feature->label = 0;
             } else {

         (m_fs[plugin], n * sizeof(VampFeatureList));
 
     while (i < n) {
         m_fs[plugin][i].featureCount = 0;
         m_fs[plugin][i].features = 0;
+        m_fs[plugin][i].featuresV2 = 0;
         m_fsizes[plugin].push_back(0);
         m_fvsizes[plugin].push_back(std::vector<size_t>());
         i++;
     }
 }

 //    std::cerr << "resizing from " << i << std::endl;
 
     m_fs[plugin][n].features = (VampFeature *)realloc
         (m_fs[plugin][n].features, sz * sizeof(VampFeature));
 
+    m_fs[plugin][n].featuresV2 = (VampFeatureV2 *)realloc
+        (m_fs[plugin][n].featuresV2, sz * sizeof(VampFeatureV2));
+
     while (m_fsizes[plugin][n] < sz) {
+        m_fs[plugin][n].features[m_fsizes[plugin][n]].hasTimestamp = 0;
         m_fs[plugin][n].features[m_fsizes[plugin][n]].valueCount = 0;
         m_fs[plugin][n].features[m_fsizes[plugin][n]].values = 0;
         m_fs[plugin][n].features[m_fsizes[plugin][n]].label = 0;
+        m_fs[plugin][n].featuresV2[m_fsizes[plugin][n]].hasDuration = 0;
         m_fvsizes[plugin][n].push_back(0);
         m_fsizes[plugin][n]++;
     }
 }