comparison host/vamp-simple-host.cpp @ 52:d3995d2b5e08

* Fix from Craig Sapp for incorrect mixdown code

             for (int j = 0; j < blockSize; ++j) {
                 plugbuf[c][j] = 0.0f;
             }
         }
 
-        for (int c = 0; c < sfinfo.channels; ++c) {
-            int tc = c;
-            if (mix) tc = 0;
-            for (int j = 0; j < blockSize && j < count; ++j) {
-                plugbuf[tc][j] += filebuf[j * channels + c];
+        for (int j = 0; j < blockSize && j < count; ++j) {
+            int tc = 0;
+            for (int c = 0; c < sfinfo.channels; ++c) {
+                tc = c;
+                if (mix) tc = 0;
+                plugbuf[tc][j] += filebuf[j * sfinfo.channels + c];
             }
-
-            if (plugin->getInputDomain() == Vamp::Plugin::FrequencyDomain) {
-                transformInput(plugbuf[tc], blockSize);
+            if (mix) {
+                plugbuf[0][j] /= sfinfo.channels;
+            }
+        }
+
+        if (plugin->getInputDomain() == Vamp::Plugin::FrequencyDomain) {
+            for (int c = 0; c < sfinfo.channels; ++c) {
+                transformInput(plugbuf[c], blockSize);
+                if (mix) break;
             }
         }
 
         printFeatures
             (i, sfinfo.samplerate, output, plugin->process