comparison json/VampJson.h @ 35:54676b4e224e

Since JSON is no longer the "fast" protocol format, might as well use the non-b64 encoding by default now

         size_t n = decoded.size() / sizeof(float);
         return std::vector<float>(buffer, buffer + n);
     }
 
     static json11::Json
-    fromFeature(const Vamp::Plugin::Feature &f) {
+    fromFeature(const Vamp::Plugin::Feature &f, bool asText) {
 
         json11::Json::object jo;
         if (f.values.size() > 0) {
-            jo["b64values"] = fromFloatBuffer(f.values.data(), f.values.size());
+            if (asText) {
+                jo["values"] = json11::Json::array(f.values.begin(),
+                                                   f.values.end());
+            } else {
+                jo["b64values"] = fromFloatBuffer(f.values.data(),
+                                                  f.values.size());
+            }
         }
         if (f.label != "") {
             jo["label"] = f.label;
         }
         if (f.hasTimestamp) {

         f.label = j["label"].string_value();
         return f;
     }
 
     static json11::Json
-    fromFeatureSet(const Vamp::Plugin::FeatureSet &fs) {
+    fromFeatureSet(const Vamp::Plugin::FeatureSet &fs, bool asText) {
 
         json11::Json::object jo;
         for (const auto &fsi : fs) {
             std::vector<json11::Json> fj;
             for (const Vamp::Plugin::Feature &f: fsi.second) {
-                fj.push_back(fromFeature(f));
+                fj.push_back(fromFeature(f, asText));
             }
             std::stringstream sstr;
             sstr << fsi.first;
             std::string n = sstr.str();
             jo[n] = fj;

         
         json11::Json::object jo;
         jo["type"] = "process";
         jo["success"] = true;
         jo["errorText"] = "";
-        jo["content"] = fromFeatureSet(resp.features);
+        jo["content"] = fromFeatureSet(resp.features, true);
         return json11::Json(jo);
     }
     
     static json11::Json
     fromVampRequest_Finish(Vamp::Plugin *p,

 
         json11::Json::object jo;
         jo["type"] = "finish";
         jo["success"] = true;
         jo["errorText"] = "";
-        jo["content"] = fromFeatureSet(resp.features);
+        jo["content"] = fromFeatureSet(resp.features, true);
         return json11::Json(jo);
     }
 
 private: // go private briefly for a couple of helper functions