comparison perf-test.js @ 105:4845fbb1a516

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).

 }
 
 function processRaw(request) {
     
     const nChannels = request.processInput.inputBuffers.length;
-    const nFrames = request.processInput.inputBuffers[0].values.length;
+    const nFrames = request.processInput.inputBuffers[0].length;
 
     const buffersPtr = exampleModule._malloc(nChannels * 4);
     const buffers = new Uint32Array(
         exampleModule.HEAPU8.buffer, buffersPtr, nChannels);
 
     for (let i = 0; i < nChannels; ++i) {
         const framesPtr = exampleModule._malloc(nFrames * 4);
         const frames = new Float32Array(
             exampleModule.HEAPU8.buffer, framesPtr, nFrames);
-        frames.set(request.processInput.inputBuffers[i].values);
+        frames.set(request.processInput.inputBuffers[i]);
         buffers[i] = framesPtr;
     }
     
     const responseJson = vampipeProcessRaw(
         request.pluginHandle,

     for (let i = 0; i < nChannels; ++i) {
         exampleModule._free(buffers[i]);
     }
     exampleModule._free(buffersPtr);
 
-    const response = JSON.parse(
-        exampleModule.Pointer_stringify(responseJson));
+    const responseJstr = exampleModule.Pointer_stringify(responseJson);
+    const response = JSON.parse(responseJstr);
     
     vampipeFreeJson(responseJson);
     
     return response;
 }

         out.duration = wfeature.duration;
     }
     if (wfeature.label != null) {
         out.label = wfeature.label;
     }
-    if (wfeature.b64values != null && wfeature.b64values !== "") {
-        out.values = myFromBase64(wfeature.b64values);
-    } else if (wfeature.values != null) {
-        out.values = new Float32Array(wfeature.values);
+    const vv = wfeature.featureValues;
+    if (vv != null) {
+        if (typeof vv === "string") {
+            out.featureValues = myFromBase64(vv);
+        } else {
+            out.featureValues = new Float32Array(vv);
+        }
     }
     return out;
 }
 
 function convertWireFeatureList(wfeatures) {

 
     const makeBlock = (n => { 
         return {
             timestamp : frame2timestamp(n * blockSize, rate),
             inputBuffers : [
-                { values : new Float32Array(
-                    Array.from(Array(blockSize).keys(),
-                               n => n / blockSize)) }
+                new Float32Array(Array.from(Array(blockSize).keys(),
+                                            n => n / blockSize))
             ],
         }
     });
     
     const blocks = Array.from(Array(nblocks).keys(), makeBlock);

 	result = processRaw({
 	    "pluginHandle": 1,
 	    "processInput": blocks[i]
 	});
         let features = responseToFeatureSet(result);
-        let count = features.get("counts")[0].values[0];
+        let count = features.get("counts")[0].featureValues[0];
         total += count;
     }
 
     let finish = (new Date()).getTime();
     comment("Finish at " + finish + " for a time of " + (finish - start) + " ms");

 	result = processRaw({
 	    "pluginHandle": 1,
 	    "processInput": blocks[i]
 	});
         let features = responseToFeatureSet(result);
-        let count = features.get("counts")[0].values[0];
+        let count = features.get("counts")[0].featureValues[0];
         total += count;
     }
 
     finish = (new Date()).getTime();
     comment("Finish at " + finish + " for a time of " + (finish - start) + " ms");