VamPipe Adapter Test

# HG changeset patch # User Chris Cannam # Date 1472032240 -3600 # Node ID 8db9271524972098cb1fa93de63bb104192d6739 # Parent c2a90b45642ee54210430cf9f02c5830fcf98224 Simple test script (and associated fixes) for the JS code diff -r c2a90b45642e -r 8db927152497 Makefile.example.emscripten --- a/Makefile.example.emscripten Tue Aug 23 21:46:49 2016 +0100 +++ b/Makefile.example.emscripten Wed Aug 24 10:50:40 2016 +0100 @@ -33,6 +33,7 @@ -s NO_FILESYSTEM=1 \ -s MODULARIZE=1 \ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \ + -s DISABLE_EXCEPTION_CATCHING=0 \ -s EXPORT_NAME="'ExampleModule'" \ -s EXPORTED_FUNCTIONS="['_vampipeRequestJson','_vampipeFreeJson']" @@ -45,7 +46,9 @@ EXAMPLE_LDFLAGS := $(EMFLAGS) CXX := em++ -CXXFLAGS := -std=c++11 -fPIC -Wall -Wextra -g +#OPTFLAGS := -g3 +OPTFLAGS := -O3 +CXXFLAGS := -std=c++11 -fPIC -Wall -Wextra $(OPTFLAGS) INCPATH := -I$(SDK_DIR) -I.. -I../json all: $(EXAMPLE) diff -r c2a90b45642e -r 8db927152497 quick-test.cpp --- a/quick-test.cpp Tue Aug 23 21:46:49 2016 +0100 +++ b/quick-test.cpp Wed Aug 24 10:50:40 2016 +0100 @@ -34,5 +34,10 @@ const char *listResponse = reqFn(listRequest.c_str()); cout << listResponse << endl; freeFn(listResponse); + + string loadRequest = "{\"type\":\"load\",\"content\": {\"pluginKey\":\"vamp-example-plugins:zerocrossing\",\"inputSampleRate\":44100,\"adapterFlags\":[\"AdaptAllSafe\"]}}"; + const char *loadResponse = reqFn(loadRequest.c_str()); + cout << loadResponse << endl; + freeFn(loadResponse); } diff -r c2a90b45642e -r 8db927152497 quick-test.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/quick-test.html Wed Aug 24 10:50:40 2016 +0100 @@ -0,0 +1,21 @@ + + + + VamPipe Adapter Test + + + + + + + +

VamPipe Adapter Test

+ +

+ + + diff -r c2a90b45642e -r 8db927152497 quick-test.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/quick-test.js Wed Aug 24 10:50:40 2016 +0100 @@ -0,0 +1,78 @@ +"use strict"; + +var exampleModule = ExampleModule(); + +// It is possible to declare both parameters and return values as +// "string", in which case Emscripten will take care of +// conversions. But it's not clear how one would manage memory for +// newly-constructed returned C strings -- the returned pointer from +// vampipeRequestJson would appear (?) to be thrown away by the +// Emscripten string converter if we declare it as returning a string, +// so we have no opportunity to pass it to vampipeFreeJson, which +// suggests this would leak memory if the string isn't static. Not +// wholly sure though. Anyway, passing and returning pointers (as +// numbers) means we can manage the Emscripten heap memory however we +// want in our request wrapper function below. + +var vampipeRequestJson = exampleModule.cwrap( + 'vampipeRequestJson', 'number', ['number'] +); + +var vampipeFreeJson = exampleModule.cwrap( + 'vampipeFreeJson', 'void', ['number'] +); + +function request(jsonStr) { + var m = exampleModule; + // Inspection reveals that intArrayFromString converts the string + // from utf16 to utf8, which is what we want (though the docs + // don't mention this). Note the *Cstr values are Emscripten heap + // pointers + var inCstr = m.allocate(m.intArrayFromString(jsonStr), 'i8', m.ALLOC_NORMAL); + var outCstr = vampipeRequestJson(inCstr); + m._free(inCstr); + var result = m.Pointer_stringify(outCstr); + vampipeFreeJson(outCstr); + return result; +} + +function note(blah) { + document.getElementById("test-result").innerHTML += blah + "
"; +} + +function test() { + + note("Querying plugin list..."); + var result = request('{"type": "list"}'); + note("Result JSON = " + result); + + note("
Loading zero crossings plugin..."); + result = request('{"type":"load","content": {"pluginKey":"vamp-example-plugins:zerocrossing","inputSampleRate":16,"adapterFlags":["AdaptAllSafe"]}}'); + note("Result JSON = " + result); + + note("
I'm now assuming that the load succeeded and the returned pluginHandle was 1. I haven't bothered to parse the JSON. If those assumptions are wrong, this obviously isn't going to work. Configuring the plugin..."); + result = request('{"type":"configure","content":{"pluginHandle":1,"configuration":{"blockSize": 8, "channelCount": 1, "stepSize": 8}}}'); + note("Result JSON = " + result); + + note("
If I try to configure it again, it should fail because it's already configured... but this doesn't change anything, and subsequent processing should work fine. Just an example of a failure call. NB this only works if Emscripten has exception catching enabled -- it's off by default in opt builds, which would just end the script here. Wonder what the performance penalty is like."); + result = request('{"type":"configure","content":{"pluginHandle":1,"configuration":{"blockSize": 8, "channelCount": 1, "stepSize": 8}}}'); + note("Result JSON = " + result); + + note("
Now processing a couple of blocks of data, on the same assumptions..."); + result = request('{"type":"process","content":{"pluginHandle":1,"processInput":{"timestamp":{"s":0,"n":0},"inputBuffers":[{"values":[0,1,-1,0,1,-1,0,1]}]}}}'); + note("Result JSON = " + result); + result = request('{"type":"process","content":{"pluginHandle":1,"processInput":{"timestamp":{"s":0,"n":500000000},"inputBuffers":[{"values":[0,1,-1,0,1,-1,0,1]}]}}}'); + note("Result JSON = " + result); + + note("
Cleaning up the plugin and getting any remaining features..."); + result = request('{"type":"finish","content":{"pluginHandle":1}}'); + note("Result JSON = " + result); + + note("
A process call should now fail, as the plugin has been cleaned up."); + result = request('{"type":"process","content":{"pluginHandle":1,"processInput":{"timestamp":{"s":0,"n":1000000000},"inputBuffers":[{"values":[0,1,-1,0,1,-1,0,1]}]}}}'); + note("Result JSON = " + result); +} + +window.onload = function() { + test(); +}