lili/ggwave
1
0
Fork 0
mirror of https://github.com/ggerganov/ggwave.git synced 2026-03-25 13:31:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

js : decode now returns typed array and cannot be null

Browse Source 
If no data is decoded, then the returned array is empty.
This commit is contained in:
Georgi Gerganov
2022-05-02 19:07:06 +03:00
parent 9a26793ecf
commit d135fbbef4
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bindings/javascript/emscripten.cpp
View File

@@ -61,9 +61,7 @@ EMSCRIPTEN_BINDINGS(ggwave) {
result.resize(n); result.resize(n);
ggwave_encode(instance, data.data(), data.size(), txProtocolId, volume, result.data(), 0); ggwave_encode(instance, data.data(), data.size(), txProtocolId, volume, result.data(), 0);
return emscripten::val( return emscripten::val(emscripten::typed_memory_view(result.size(), result.data()));
emscripten::typed_memory_view(result.size(),
result.data()));
})); }));
emscripten::function("decode", emscripten::optional_override( emscripten::function("decode", emscripten::optional_override(
@@ -73,10 +71,10 @@ EMSCRIPTEN_BINDINGS(ggwave) {
auto n = ggwave_decode(instance, data.data(), data.size(), output); auto n = ggwave_decode(instance, data.data(), data.size(), output);
if (n > 0) { if (n > 0) {
return std::string(output, n); return emscripten::val(emscripten::typed_memory_view(n, output));
} }
return std::string(); return emscripten::val(emscripten::typed_memory_view(0, output));
})); }));
emscripten::function("disableLog", emscripten::optional_override( emscripten::function("disableLog", emscripten::optional_override(

2
bindings/javascript/ggwave.js
View File

File diff suppressed because one or more lines are too long

4
examples/ggwave-js/index-tmpl.html
View File

@@ -118,7 +118,7 @@
navigator.mediaDevices.getUserMedia(constraints).then(function (e) { navigator.mediaDevices.getUserMedia(constraints).then(function (e) {
mediaStream = context.createMediaStreamSource(e); mediaStream = context.createMediaStreamSource(e);
var bufferSize = 16*1024; var bufferSize = 1024;
var numberOfInputChannels = 1; var numberOfInputChannels = 1;
var numberOfOutputChannels = 1; var numberOfOutputChannels = 1;
@@ -137,7 +137,7 @@
recorder.onaudioprocess = function (e) { recorder.onaudioprocess = function (e) {
var source = e.inputBuffer; var source = e.inputBuffer;
var res = ggwave.decode(instance, convertTypedArray(new Float32Array(source.getChannelData(0)), Int8Array)); var res = ggwave.decode(instance, convertTypedArray(new Float32Array(source.getChannelData(0)), Int8Array));
if (res) { if (res && res.length > 0) {
rxData.value = res; rxData.value = res;
} }