From bd9d6b1d81cbd993e627a7f526954518d9c2e4d2 Mon Sep 17 00:00:00 2001
From: Georgi Gerganov <ggerganov@gmail.com>
Date: Sun, 21 Feb 2021 00:43:37 +0200
Subject: [PATCH] ggwave-js : simplify example (#21)

Now that ggwave support input resampling, we don't need to resample
in javascript
---
 examples/ggwave-js/CMakeLists.txt  |  1 +
 examples/ggwave-js/index-tmpl.html | 36 ++++++++++++++++++------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/examples/ggwave-js/CMakeLists.txt b/examples/ggwave-js/CMakeLists.txt
index 76f2473..0fe698f 100644
--- a/examples/ggwave-js/CMakeLists.txt
+++ b/examples/ggwave-js/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET ggwave-js)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/index-tmpl.html ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TARGET}/index.html @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/bindings/javascript/ggwave.js ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TARGET}/ggwave.js COPYONLY)
diff --git a/examples/ggwave-js/index-tmpl.html b/examples/ggwave-js/index-tmpl.html
index 9dab432..f023523 100644
--- a/examples/ggwave-js/index-tmpl.html
+++ b/examples/ggwave-js/index-tmpl.html
@@ -67,10 +67,10 @@
             // initialize audio context and ggwave
             function init() {
                 if (!context) {
-                    // todo : query ggwave's base sample rate
                     context = new AudioContext({sampleRate: 48000});
 
                     parameters = ggwave.getDefaultParameters();
+                    parameters.sampleRateInp = context.sampleRate;
                     parameters.sampleRateOut = context.sampleRate;
                     instance = ggwave.init(parameters);
                 }
@@ -136,20 +136,27 @@
 
                     recorder.onaudioprocess = function (e) {
                         var source = e.inputBuffer;
-                        var offlineCtx = new OfflineAudioContext(source.numberOfChannels, 48000*source.duration, 48000);
-                        var offlineSource = offlineCtx.createBufferSource();
+                        var res = ggwave.decode(instance, convertTypedArray(new Float32Array(source.getChannelData(0)), Int8Array));
+                        if (res) {
+                            rxData.value = res;
+                        }
 
-                        offlineSource.buffer = source;
-                        offlineSource.connect(offlineCtx.destination);
-                        offlineSource.start();
-                        offlineCtx.startRendering();
-                        offlineCtx.oncomplete = function(e) {
-                            var resampled = e.renderedBuffer.getChannelData(0);
-                            var res = ggwave.decode(instance, convertTypedArray(new Float32Array(resampled), Int8Array));
-                            if (res) {
-                                rxData.value = res;
-                            }
-                        };
+                        // obsolete javascript resampling
+                        // since ggwave v0.2.0 the resampling is built-in ggwave
+                        //var offlineCtx = new OfflineAudioContext(source.numberOfChannels, 48000*source.duration, 48000);
+                        //var offlineSource = offlineCtx.createBufferSource();
+
+                        //offlineSource.buffer = source;
+                        //offlineSource.connect(offlineCtx.destination);
+                        //offlineSource.start();
+                        //offlineCtx.startRendering();
+                        //offlineCtx.oncomplete = function(e) {
+                        //    var resampled = e.renderedBuffer.getChannelData(0);
+                        //    var res = ggwave.decode(instance, convertTypedArray(new Float32Array(resampled), Int8Array));
+                        //    if (res) {
+                        //        rxData.value = res;
+                        //    }
+                        //};
                     }
 
                     mediaStream.connect(recorder);
@@ -167,6 +174,7 @@
                 if (recorder) {
                     recorder.disconnect(context.destination);
                     mediaStream.disconnect(recorder);
+                    recorder = null;
                 }
 
                 rxData.value = 'Audio capture is paused! Press the "Start capturing" button to analyze audio from the microphone';