diff vamp-support/LoaderRequests.h @ 186:52322dde68ea

Fix erroneous logic for handling step and block size in prior commit

The earlier change had a logical misconception. If PluginStub is
receiving the correct step and block size back from the configure call,
the plugin on the server side must have already been successfully
initialised, as the step and block size are only returned in a
successful configure response. This means the test for a failed
initialise and redo with the correct parameters must be done on the
server side (in LoaderRequests) not the client. The client has a more
complicated job, which is to notice that a *successful* configure had
returned different framing parameters from those passed to the
initialise call, and to pretend that it had actually failed until the
host called again with the correct parameters. We definitely need tests
for this!

--- a/vamp-support/LoaderRequests.h	Fri Feb 03 16:23:21 2017 +0000
+++ b/vamp-support/LoaderRequests.h	Mon Feb 06 16:44:33 2017 +0000
@@ -136,6 +136,10 @@
             return response;
         }
 
+        Framing pluginPreferredFraming;
+        pluginPreferredFraming.stepSize = req.plugin->getPreferredStepSize();
+        pluginPreferredFraming.blockSize = req.plugin->getPreferredBlockSize();
+        
 	if (req.plugin->initialise(req.configuration.channelCount,
 				   req.configuration.framing.stepSize,
 				   req.configuration.framing.blockSize)) {
@@ -148,13 +152,54 @@
             response.framing = req.configuration.framing;
 
 	} else {
+           
+            // If initialise() fails, one reason could be that it
+            // didn't like the passed-in framing (step and block
+            // size).
+            // 
+            // Vamp and Piper have quite different mechanisms for
+            // negotiating step and block size:
+            //
+            // - If a Vamp plugin doesn't like the step and block size
+            // passed to initialise(), it fails the initialise() call,
+            // returning false from it. The host is expected to have
+            // called getPreferredStepSize()/BlockSize() after it made
+            // any parameter changes that might have affected these
+            // preferences (but before calling initialise).
+            //
+            // - If a Piper server doesn't like the step and block
+            // size passed in a configure request, but if everything
+            // else about the configure request is OK, then it returns
+            // a successful configure response including its preferred
+            // step and block sizes in the response (which the host
+            // must then use). The important thing to note is that
+            // this is still a successful response, something we do
+            // not yet have here.
+            //
+            // We need to check whether the passed-in framing differs
+            // from the plugin's preferences; if so, then we form a
+            // working supposition that initialise() failed because of
+            // this. Vamp contains nothing to allow us to test this,
+            // except to try initialise() again with different
+            // values. So we try again with the values the plugin told
+            // us it would prefer and, if that succeeds, return them
+            // in a successful response in the Piper manner.
+            //
+            // Note that if the "other side" (i.e. the client) wants
+            // to interpret this as if it were dealing with a Vamp
+            // plugin, then it's going to need some equal-but-opposite
+            // acrobatics.
 
-            // If initialise() fails, one reason could be that it
-            // didn't like the passed-in step and block size. If we
-            // return its current preferred values here, the
-            // host/client can retry with these (if they differ)
-            response.framing.stepSize = req.plugin->getPreferredStepSize();
-            response.framing.blockSize = req.plugin->getPreferredBlockSize();
+            if (req.plugin->initialise(req.configuration.channelCount,
+                                       pluginPreferredFraming.stepSize,
+                                       pluginPreferredFraming.blockSize)) {
+
+                response.outputs = req.plugin->getOutputDescriptors();
+                response.framing = pluginPreferredFraming;
+
+            } // ... else we return no outputs, which is the error
+              // case (presumably to be converted to Piper error
+              // response).
         }
 
 	return response;