comparison vamp-json/VampJson.h @ 185:3eb00e5c76c4

Pull step & block size out into framing struct, return in config

Update the C++ code to separate out the framing parameters (step and
block size) from the configuration structure into their own structure,
as in the latest schema, and to return the accepted framing params in
the configuration response.

This also implies that the plugin stub (which adapts Piper API
back to Vamp) makes a note of the returned values,
making them available via its own getPreferredStep/BlockSize
so that the host can retry the initialise call in the case where it
failed for having the wrong values first time.

         if (c.currentProgram != "") {
             jo["currentProgram"] = c.currentProgram;
         }
 
         jo["channelCount"] = c.channelCount;
-        jo["stepSize"] = c.stepSize;
-        jo["blockSize"] = c.blockSize;
+
+        json11::Json::object framing;
+        framing["stepSize"] = c.framing.stepSize;
+        framing["blockSize"] = c.framing.blockSize;
+        jo["framing"] = framing;
     
         return json11::Json(jo);
     }
 
     static PluginConfiguration
     toPluginConfiguration(json11::Json j, std::string &err) {
         
         if (!j.has_shape({
-                    { "channelCount", json11::Json::NUMBER },
+                    { "channelCount", json11::Json::NUMBER } }, err)) {
+            err = "malformed plugin configuration: " + err;
+            return {};
+        }
+
+        if (!j["framing"].has_shape({
                     { "stepSize", json11::Json::NUMBER },
                     { "blockSize", json11::Json::NUMBER } }, err)) {
-            err = "malformed plugin configuration: " + err;
-            return {};
-        }
-
+            err = "malformed framing: " + err;
+            return {};
+        }
+                    
         if (!j["parameterValues"].is_null() &&
             !j["parameterValues"].is_object()) {
             err = "object expected for parameter values";
             return {};
         }

         }
 
         PluginConfiguration config;
 
         config.channelCount = int(round(j["channelCount"].number_value()));
-        config.stepSize = int(round(j["stepSize"].number_value()));
-        config.blockSize = int(round(j["blockSize"].number_value()));
+        config.framing.stepSize = int(round(j["framing"]["stepSize"].number_value()));
+        config.framing.blockSize = int(round(j["framing"]["blockSize"].number_value()));
         
         for (auto &pv : j["parameterValues"].object_items()) {
             config.parameterValues[pv.first] = float(pv.second.number_value());
         }
 

         json11::Json::array outs;
         for (auto &d: cr.outputs) {
             outs.push_back(fromOutputDescriptor(d));
         }
         jo["outputList"] = outs;
+
+        json11::Json::object framing;
+        framing["stepSize"] = cr.framing.stepSize;
+        framing["blockSize"] = cr.framing.blockSize;
+        jo["framing"] = framing;
         
         return json11::Json(jo);
     }
 
     static ConfigurationResponse
     toConfigurationResponse(json11::Json j,
                             const PluginHandleMapper &pmapper, std::string &err) {
         
         ConfigurationResponse cr;
 
-        cr.plugin = pmapper.handleToPlugin(j["handle"].int_value());
+        if (!j["framing"].has_shape({
+                    { "stepSize", json11::Json::NUMBER },
+                    { "blockSize", json11::Json::NUMBER } }, err)) {
+            err = "malformed framing: " + err;
+            return {};
+        }
         
         if (!j["outputList"].is_array()) {
             err = "array expected for output list";
             return {};
         }
+        
+        cr.plugin = pmapper.handleToPlugin(j["handle"].int_value());
 
         for (const auto &o: j["outputList"].array_items()) {
             cr.outputs.push_back(toOutputDescriptor(o, err));
             if (failed(err)) return {};
         }
 
+        cr.framing.stepSize = int(round(j["framing"]["stepSize"].number_value()));
+        cr.framing.blockSize = int(round(j["framing"]["blockSize"].number_value()));
+        
         return cr;
     }
 
     static json11::Json
     fromProcessRequest(const ProcessRequest &r,