Mercurial > hg > piper-cpp

changeset 66:6f160dee1192

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Instead of using separate values and b64values entries in JSON serialisations, allow numeric arrays to be replaced by b64 variants wherever they appear (discriminating by type). Also rename values to featureValues in feature throughout, as values turns out to be a hazardous name in a JS context. Finally use Array instead of Text for array encoding (seems clearer).
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 27 Sep 2016 15:04:59 +0100
parents 2d866edd79d5
children db17657ac875 91fda9470ee2
files capnproto/VampnProto.h capnproto/vamp.capnp json/VampJson.h test/test-vampipe-server.sh utilities/vampipe-convert.cpp
diffstat 5 files changed, 43 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/capnproto/VampnProto.h	Fri Sep 23 14:23:10 2016 +0100
+++ b/capnproto/VampnProto.h	Tue Sep 27 15:04:59 2016 +0100
@@ -277,7 +277,7 @@
         b.setLabel(f.label);
 
         if (f.values.size() > 0) {
-            auto values = b.initValues(f.values.size());
+            auto values = b.initFeatureValues(f.values.size());
             for (size_t i = 0; i < f.values.size(); ++i) {
                 values.set(i, f.values[i]);
             }
@@ -301,7 +301,7 @@
         f.label = r.getLabel();
 
         f.values.clear();
-        auto vv = r.getValues();
+        auto vv = r.getFeatureValues();
         for (auto v: vv) {
             f.values.push_back(v);
         }
--- a/capnproto/vamp.capnp	Fri Sep 23 14:23:10 2016 +0100
+++ b/capnproto/vamp.capnp	Tue Sep 27 15:04:59 2016 +0100
@@ -95,7 +95,7 @@
     hasDuration        @2  :Bool        = false;
     duration           @3  :RealTime;
     label              @4  :Text;
-    values             @5  :List(Float32) = [];
+    featureValues      @5  :List(Float32) = [];
 }
 
 struct FeatureSet {
--- a/json/VampJson.h	Fri Sep 23 14:23:10 2016 +0100
+++ b/json/VampJson.h	Tue Sep 27 15:04:59 2016 +0100
@@ -78,11 +78,12 @@
 {
 public:
     /** Serialisation format for arrays of floats (process input and
-     *  feature values). Structures that can be serialised in more
-     *  than one way will include either a "values" field (for Text
-     *  serialisation) or a "b64values" field (for Base64) but should
-     *  not include both. When parsing, if a "b64values" field is
-     *  found, it will always take priority over a "values" field.
+     *  feature values). Wherever such an array appears, it may
+     *  alternatively be replaced by a single string containing a
+     *  base-64 encoding of the IEEE float buffer. When parsing, if a
+     *  string is found instead of an array in this case, it will be
+     *  interpreted as a base-64 encoded buffer. Only array or base-64
+     *  encoding may be provided, not both.
      */
     enum class BufferSerialisation {
 
@@ -90,13 +91,12 @@
          *  is relatively slow to parse and serialise, and can take a
          *  lot of space.
          */
-        Text,
+        Array,
 
-        /** Base64-encoded string of the raw data as packed IEEE
-         *  32-bit floats. Faster and more compact than the text
-         *  encoding but more complicated to provide, especially if
-         *  starting from an environment that does not use IEEE 32-bit
-         *  floats! Note that Base64 serialisations produced by this
+        /** Base64-encoded string of the raw data as packed
+         *  little-endian IEEE 32-bit floats. Faster and more compact
+         *  than the text encoding but more complicated to
+         *  provide. Note that Base64 serialisations produced by this
          *  library do not including padding characters and so are not
          *  necessarily multiples of 4 characters long. You will need
          *  to pad them yourself if concatenating them or supplying to
@@ -400,12 +400,12 @@
 
         json11::Json::object jo;
         if (f.values.size() > 0) {
-            if (serialisation == BufferSerialisation::Text) {
-                jo["values"] = json11::Json::array(f.values.begin(),
-                                                   f.values.end());
+            if (serialisation == BufferSerialisation::Array) {
+                jo["featureValues"] = json11::Json::array(f.values.begin(),
+                                                          f.values.end());
             } else {
-                jo["b64values"] = fromFloatBuffer(f.values.data(),
-                                                  f.values.size());
+                jo["featureValues"] = fromFloatBuffer(f.values.data(),
+                                                      f.values.size());
             }
         }
         if (f.label != "") {
@@ -438,15 +438,15 @@
             if (failed(err)) return {};
             f.hasDuration = true;
         }
-        if (j["b64values"].is_string()) {
-            f.values = toFloatBuffer(j["b64values"].string_value(), err);
+        if (j["featureValues"].is_string()) {
+            f.values = toFloatBuffer(j["featureValues"].string_value(), err);
             if (failed(err)) return {};
             serialisation = BufferSerialisation::Base64;
-        } else if (j["values"].is_array()) {
-            for (auto v : j["values"].array_items()) {
+        } else if (j["featureValues"].is_array()) {
+            for (auto v : j["featureValues"].array_items()) {
                 f.values.push_back(v.number_value());
             }
-            serialisation = BufferSerialisation::Text;
+            serialisation = BufferSerialisation::Array;
         }
         f.label = j["label"].string_value();
         return f;
@@ -943,15 +943,13 @@
 
         json11::Json::array chans;
         for (size_t i = 0; i < r.inputBuffers.size(); ++i) {
-            json11::Json::object c;
-            if (serialisation == BufferSerialisation::Text) {
-                c["values"] = json11::Json::array(r.inputBuffers[i].begin(),
-                                                  r.inputBuffers[i].end());
+            if (serialisation == BufferSerialisation::Array) {
+                chans.push_back(json11::Json::array(r.inputBuffers[i].begin(),
+                                                    r.inputBuffers[i].end()));
             } else {
-                c["b64values"] = fromFloatBuffer(r.inputBuffers[i].data(),
-                                                 r.inputBuffers[i].size());
+                chans.push_back(fromFloatBuffer(r.inputBuffers[i].data(),
+                                                r.inputBuffers[i].size()));
             }
-            chans.push_back(c);
         }
         io["inputBuffers"] = chans;
         
@@ -986,25 +984,25 @@
         r.timestamp = toRealTime(input["timestamp"], err);
         if (failed(err)) return {};
 
-        for (auto a: input["inputBuffers"].array_items()) {
+        for (const auto &a: input["inputBuffers"].array_items()) {
 
-            if (a["b64values"].is_string()) {
-                std::vector<float> buf = toFloatBuffer(a["b64values"].string_value(),
+            if (a.is_string()) {
+                std::vector<float> buf = toFloatBuffer(a.string_value(),
                                                        err);
                 if (failed(err)) return {};
                 r.inputBuffers.push_back(buf);
                 serialisation = BufferSerialisation::Base64;
 
-            } else if (a["values"].is_array()) {
+            } else if (a.is_array()) {
                 std::vector<float> buf;
-                for (auto v : a["values"].array_items()) {
+                for (auto v : a.array_items()) {
                     buf.push_back(v.number_value());
                 }
                 r.inputBuffers.push_back(buf);
-                serialisation = BufferSerialisation::Text;
+                serialisation = BufferSerialisation::Array;
 
             } else {
-                err = "expected values or b64values in inputBuffers object";
+                err = "expected arrays or strings in inputBuffers array";
                 return {};
             }
         }
--- a/test/test-vampipe-server.sh	Fri Sep 23 14:23:10 2016 +0100
+++ b/test/test-vampipe-server.sh	Tue Sep 27 15:04:59 2016 +0100
@@ -57,6 +57,6 @@
 {"type":"list"}
 {"type":"load","content": {"pluginKey":"vamp-example-plugins:percussiononsets","inputSampleRate":44100,"adapterFlags":["AdaptInputDomain","AdaptBufferSize"]}}
 {"type":"configure","content":{"pluginHandle":1,"configuration":{"blockSize": 8, "channelCount": 1, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 8}}}
-{"type":"process","content": {"pluginHandle": 1, "processInput": { "timestamp": {"s": 0, "n": 0}, "inputBuffers": [{"values": [1,2,3,4,5,6,7,8]}]}}}
+{"type":"process","content": {"pluginHandle": 1, "processInput": { "timestamp": {"s": 0, "n": 0}, "inputBuffers": [ [1,2,3,4,5,6,7,8] ]}}}
 {"type":"finish","content": {"pluginHandle": 1}}
 EOF
--- a/utilities/vampipe-convert.cpp	Fri Sep 23 14:23:10 2016 +0100
+++ b/utilities/vampipe-convert.cpp	Tue Sep 27 15:04:59 2016 +0100
@@ -96,7 +96,8 @@
     rr.type = VampJson::getRequestResponseType(j, err);
     if (err != "") return {};
     
-    VampJson::BufferSerialisation serialisation = VampJson::BufferSerialisation::Text;
+    VampJson::BufferSerialisation serialisation =
+        VampJson::BufferSerialisation::Array;
 
     switch (rr.type) {
 
@@ -130,7 +131,7 @@
     VampJson::BufferSerialisation serialisation =
         (useBase64 ?
          VampJson::BufferSerialisation::Base64 :
-         VampJson::BufferSerialisation::Text);
+         VampJson::BufferSerialisation::Array);
 
     switch (rr.type) {
 
@@ -176,7 +177,8 @@
     rr.type = VampJson::getRequestResponseType(j, err);
     if (err != "") return {};
     
-    VampJson::BufferSerialisation serialisation = VampJson::BufferSerialisation::Text;
+    VampJson::BufferSerialisation serialisation =
+        VampJson::BufferSerialisation::Array;
 
     rr.success = j["success"].bool_value();
     rr.errorText = j["errorText"].string_value();
@@ -213,7 +215,7 @@
     VampJson::BufferSerialisation serialisation =
         (useBase64 ?
          VampJson::BufferSerialisation::Base64 :
-         VampJson::BufferSerialisation::Text);
+         VampJson::BufferSerialisation::Array);
 
     if (!rr.success) {