comparison vamp-sdk/PluginHostAdapter.cpp @ 12:a3d35e11c3fe

* Avoid repeated malloc/free for returned feature lists -- reuse static
  feature lists where possible.  Need to document the host behaviour that
  permits this (i.e. a returned feature list is only valid until the next
  call to process, getRemainingFeatures or releaseFeatureSet)

     if (!m_handle) return fs;
 
     int sec = timestamp.sec;
     int nsec = timestamp.nsec;
     
-    VampFeatureList **features = m_descriptor->process(m_handle,
+    VampFeatureList *features = m_descriptor->process(m_handle,
                                                       inputBuffers,
                                                       sec, nsec);
     
     convertFeatures(features, fs);
     m_descriptor->releaseFeatureSet(features);

 PluginHostAdapter::getRemainingFeatures()
 {
     FeatureSet fs;
     if (!m_handle) return fs;
     
-    VampFeatureList **features = m_descriptor->getRemainingFeatures(m_handle); 
+    VampFeatureList *features = m_descriptor->getRemainingFeatures(m_handle); 
 
     convertFeatures(features, fs);
     m_descriptor->releaseFeatureSet(features);
     return fs;
 }
 
 void
-PluginHostAdapter::convertFeatures(VampFeatureList **features,
+PluginHostAdapter::convertFeatures(VampFeatureList *features,
                                    FeatureSet &fs)
 {
     if (!features) return;
 
-    for (unsigned int i = 0; features[i]; ++i) {
+    unsigned int outputs = m_descriptor->getOutputCount(m_handle);
+
+    for (unsigned int i = 0; i < outputs; ++i) {
         
-        VampFeatureList &list = *features[i];
+        VampFeatureList &list = features[i];
 
         if (list.featureCount > 0) {
 
             for (unsigned int j = 0; j < list.featureCount; ++j) {