comparison transform/FeatureExtractionPluginTransform.cpp @ 74:47fd14e29813

* Fix long-standing off-by-1 bug in WaveFileModel that was getting us the wrong
  values for almost all audio data when merging channels (channel == -1)
* Implement cut, copy and paste
* Make draw mode work properly in time value layer
* Minor fixes to CSV import

     m_stepSize = m_plugin->getPreferredStepSize();
 
     if (m_blockSize == 0) m_blockSize = 1024; //!!! todo: ask user
     if (m_stepSize == 0) m_stepSize = m_blockSize; //!!! likewise
 
-    Vamp::Plugin::OutputList outputs =
-	m_plugin->getOutputDescriptors();
+    //!!! cope with plugins that request non-power-of-2 block sizes in
+    // the frequency domain!
+
+    Vamp::Plugin::OutputList outputs = m_plugin->getOutputDescriptors();
 
     if (outputs.empty()) {
 	std::cerr << "FeatureExtractionPluginTransform: Plugin \""
 		  << pluginId.toStdString() << "\" has no outputs" << std::endl;
 	return;

 
     while (got < size) {
         buffer[offset + got] = 0.0;
         ++got;
     }
+
+    if (m_channel == -1 && channelCount == 1 &&
+        getInput()->getChannelCount() > 1) {
+        // use mean instead of sum, as plugin input
+        int cc = getInput()->getChannelCount();
+        for (long i = 0; i < size; ++i) {
+            buffer[i] /= cc;
+        }
+    }
 }
 
 void
 FeatureExtractionPluginTransform::addFeature(size_t blockFrame,
 					     const Vamp::Plugin::Feature &feature)