comparison quick-test.cpp @ 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).
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 27 Sep 2016 15:04:59 +0100
parents 5e6ff69b4209
children a9dbf9f45896
comparison
equal deleted inserted replaced
104:2b20e610c4c2 105:4845fbb1a516
43 string configRequest = "{\"type\":\"configure\",\"content\":{\"pluginHandle\":1,\"configuration\":{\"blockSize\":8,\"channelCount\":1,\"stepSize\":8}}}"; 43 string configRequest = "{\"type\":\"configure\",\"content\":{\"pluginHandle\":1,\"configuration\":{\"blockSize\":8,\"channelCount\":1,\"stepSize\":8}}}";
44 const char *configResponse = reqFn(configRequest.c_str()); 44 const char *configResponse = reqFn(configRequest.c_str());
45 cout << configResponse << endl; 45 cout << configResponse << endl;
46 freeFn(configResponse); 46 freeFn(configResponse);
47 47
48 string processRequest = "{\"type\":\"process\",\"content\":{\"pluginHandle\":1,\"processInput\":{\"timestamp\":{\"s\":0,\"n\":0},\"inputBuffers\":[{\"values\":[0,1,0,-1,0,1,0,-1]}]}}}"; 48 string processRequest = "{\"type\":\"process\",\"content\":{\"pluginHandle\":1,\"processInput\":{\"timestamp\":{\"s\":0,\"n\":0},\"inputBuffers\":[[0,1,0,-1,0,1,0,-1]]}}}";
49 const char *processResponse = reqFn(processRequest.c_str()); 49 const char *processResponse = reqFn(processRequest.c_str());
50 cout << processResponse << endl; 50 cout << processResponse << endl;
51 freeFn(processResponse); 51 freeFn(processResponse);
52 52
53 string b64processRequest = "{\"type\":\"process\",\"content\":{\"pluginHandle\":1,\"processInput\":{\"timestamp\":{\"s\":0,\"n\":0},\"inputBuffers\":[{\"b64values\":\"AAAAAAAAgD8AAAAAAACAvwAAAAAAAIA/AAAAAAAAgL8\"}]}}}"; 53 string b64processRequest = "{\"type\":\"process\",\"content\":{\"pluginHandle\":1,\"processInput\":{\"timestamp\":{\"s\":0,\"n\":0},\"inputBuffers\":[\"AAAAAAAAgD8AAAAAAACAvwAAAAAAAIA/AAAAAAAAgL8\"]}}}";
54 const char *b64processResponse = reqFn(b64processRequest.c_str()); 54 const char *b64processResponse = reqFn(b64processRequest.c_str());
55 cout << b64processResponse << endl; 55 cout << b64processResponse << endl;
56 freeFn(b64processResponse); 56 freeFn(b64processResponse);
57 57
58 string finishRequest = "{\"type\":\"finish\",\"content\":{\"pluginHandle\":1}}"; 58 string finishRequest = "{\"type\":\"finish\",\"content\":{\"pluginHandle\":1}}";