changeset 105:1ec604ec535d

Ensure step and block sizes are initialised if plugin returned 0 for preferred sizes
author Chris Cannam
date Wed, 27 Mar 2013 22:22:17 +0000
parents 4e57dd686674
children ff787d7194e5
files yetilab/vamp/vamp.yeti
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/yetilab/vamp/vamp.yeti	Wed Mar 27 09:14:59 2013 +0000
+++ b/yetilab/vamp/vamp.yeti	Wed Mar 27 22:22:17 2013 +0000
@@ -242,8 +242,14 @@
 returnErrorFrom p stream text = (p.dispose (); stream.close (); Error text);
 
 processWith key p outputNo stream =
-   (blockSize = p.preferredBlockSize;
-    stepSize = p.preferredStepSize;
+   (blockSize =
+        if p.preferredBlockSize == 0 then 2048
+        else p.preferredBlockSize fi;
+    stepSize =
+        if p.preferredStepSize == 0 then
+            if p.inputDomain == FrequencyDomain () then blockSize / 2
+            else blockSize fi;
+        else p.preferredStepSize fi;
     channels = 1;
     params = {
         p, sampleRate = stream.sampleRate, channels = 1,