new SEPIA VAD worker using Meyda + updated test; smaller tweaks;

Author: fquirin

src/modules/sepia-vad-worker.js

@@ -25,9 +25,21 @@ function ChannelCountException(message){
 
 var CommonConverters = {};
 
-CommonConverters.floatTo16BitPCM = function (output, input){
+CommonConverters.singleSampleFloatTo16BitPCM = function(s){
+	s = Math.max(-1, Math.min(1, s));
+	return (s < 0 ? s * 0x8000 : s * 0x7FFF);
+}
+CommonConverters.floatTo16BitPCM = function(output, input){
+	for (let i = 0; i < input.length; i++) {
+		output[i] = CommonConverters.singleSampleFloatTo16BitPCM(input[i]);
+	}
+}
+CommonConverters.singleSampleInt16ToFloat32BitAudio = function(s){
+	//s = Math.max(-32768, Math.min(32767, s));
+	return Math.max(-1.0, Math.min(1.0, s/32768));
+}
+CommonConverters.int16ToFloat32BitAudio = function(output, input){
 	for (let i = 0; i < input.length; i++) {
-		let s = Math.max(-1, Math.min(1, input[i]));
-		output[i] = s < 0 ? s * 0x8000 : s * 0x7FFF;
+		return CommonConverters.singleSampleInt16ToFloat32BitAudio(input[i]);
 	}
 }

src/modules/shared/common.js

@@ -3,6 +3,7 @@ importScripts('./shared/common.js');
 importScripts('./shared/ring-buffer.min.js');
 importScripts('./webrtc-vad/webrtc-vad-interface.min.js');
 importScripts('./webrtc-vad/webrtc-vad-wasm.js');
+//importScripts('./shared/meyda.min.compressed.js');	//we import this on demand below
 
 var vadModule;
 
@@ -52,6 +53,9 @@ let voiceEnergyCap = 50;
 let voiceEnergyDropRate = 2;
 let _samplesToTimeMsFactor;
 
+let meydaAnalyzer;
+let _meydaFeatures;
+
 let _processRingBuffer;		//holds multiple vadFrames
 let _vadFrames;				//each frame processes one chunk of '_vadBufferSize' as long as '_processRingBuffer' has enough samples
 let _vadFrameTimeMs;		//real time (ms) of one vadFrame (defined by sample-rate and buffer size)
@@ -109,7 +113,7 @@ function init(){
 
 	_isFirstValidProcess = true;
 }
-function ready(skipResampler){
+function ready(){
 	postMessage({
 		moduleState: 1,
 		moduleInfo: {
@@ -136,6 +140,7 @@ function constructWorker(options) {
 	processBufferSize = options.setup.bufferSize || inputSampleSize;
 	vadMode = (options.setup.vadMode != undefined)? options.setup.vadMode : 3;
 	isFloat32Input = (options.setup.isFloat32 != undefined)? options.setup.isFloat32 : false;
+	
 	if (options.setup.voiceEnergyCap != undefined) voiceEnergyCap = options.setup.voiceEnergyCap;
 	if (options.setup.voiceEnergyDropRate) voiceEnergyDropRate = options.setup.voiceEnergyDropRate;
 	if (options.setup.sequence){
@@ -148,6 +153,28 @@ function constructWorker(options) {
 	}else{
 		useSequenceAnalyzer = false;
 	}
+	
+	//TODO: unused so far ... keep or remove?
+	meydaAnalyzer = options.setup.meydaAnalyzer || {};
+	var meydaSettingsKeys = Object.keys(meydaAnalyzer);
+	if (meydaSettingsKeys.length > 0){
+		//import on demand
+		importScripts('./shared/meyda.min.compressed.js');
+		//setup
+		meydaSettingsKeys.forEach(function(k, i){
+			if (k == "features"){
+				_meydaFeatures = meydaAnalyzer[k];
+			}else{
+				Meyda[k] = meydaAnalyzer[k];
+			}
+		});
+		Meyda.sampleRate = targetSampleRate;
+		Meyda.bufferSize = inputSampleSize;
+		if (!Meyda.bufferSize || (Meyda.bufferSize & (Meyda.bufferSize -1) != 0)){
+			throw {name: "VadModuleMeydaError", message: "Meyda buffer-size must be power of 2, e.g. 128, 256, 512, 1024, ..."};
+		}
+	}
+	
 	init();
 
 	function onVadLog(msg){
@@ -273,8 +300,8 @@ function process(data) {
 				throw JSON.stringify(new SampleRateException(msg));			//NOTE: this needs to be a string to show up in worker.onerror properly :-/
 				return;
 			}
-			var inputArrayType = data.type || data.samples[0].constructor.name;
-			var isFloat32 = (inputArrayType.indexOf("Float32") >= 0);
+			let inputArrayType = data.type || data.samples[0].constructor.name;
+			let isFloat32 = (inputArrayType.indexOf("Float32") >= 0);
 			if (isFloat32 != isFloat32Input){
 				var msg = "Array type mismatch! Input samples are of type '" + inputArrayType + "' but expected: " + (isFloat32Input? "Float32" : "Int16");
 				console.error("Audio Worker type exception - Msg.: " + msg);

src/modules/shared/meyda.min.compressed.js

@@ -652,7 +652,7 @@ if (!(typeof SepiaFW == "object")){
 		//INTERFACE
 
 		thisProcessor.start = function(){
-			if (!isProcessing){
+			if (isInitialized && !isProcessing){
 				startFun(function(){
 					var startTime = new Date().getTime();	//TODO: is this maybe already too late?
 					setStateProcessing();

src/modules/shared/ring-buffer.min.js

@@ -33,7 +33,12 @@ class SpeexResampler {
 		if (chunk.constructor.name.indexOf("Int16Array") != 0) {
             throw new Error("Chunk format has to be 'Int16Array'");
         }else{
-			chunk = new Uint8Array(chunk.buffer);	//TODO: I've tried to simply set 'speexModule.HEAP16' (see below) but it gives no result ...
+			chunk = new Uint8Array(chunk.buffer);	//TODO: I've tried to simply set 'speexModule.HEAP16' (see below) but it gives no result ... WHY DOES THIS WORK instead of real conversion??
+			//C interface: speex_resampler_process_int(SpeexResamplerState *st, unsigned int channel_index, const short *in, unsigned int *in_len, short *out, unsigned int *out_len)
+			/*
+			unsigned int -> HEAPU32
+			short -> HEAP16
+			*/
 		}
         // We check that we have as many chunks for each channel and that the last chunk is full (2 bytes)
         if (chunk.length % (this.channels * Uint16Array.BYTES_PER_ELEMENT) !== 0) {
@@ -54,7 +59,7 @@ class SpeexResampler {
             if (this._inBufferPtr !== -1) {
                 speexModule._free(this._inBufferPtr);
             }
-            this._inBufferPtr = speexModule._malloc(chunk.length);
+            this._inBufferPtr = speexModule._malloc(chunk.length);		//TODO: can we use Int16 and (chunk.length * chunk.BYTES_PER_ELEMENT)?
             this._inBufferSize = chunk.length;
         }
         // Resizing the output buffer in the WASM memory space to match what we need

src/modules/webrtc-vad-worker.js

@@ -43,10 +43,11 @@ var fixedPlots = {
 		use: (document.getElementById("usePlot2")? document.getElementById("usePlot2").checked : true)
 	},
 	3: {
-		graph: (new uPlot.lazy.AutoSeries(document.getElementById('chart3'), 50, {
+		graph: (new uPlot.lazy.AutoSeries(document.getElementById('chart3'), 150, {
 			//rememberMax: true
 		}, {
-			yRange: [-0.1, 1.1]
+			showAxisX: false
+			//yRange: [-0.1, 1.1]
 		})),
 		use: (document.getElementById("usePlot3")? document.getElementById("usePlot3").checked : true)
 	},
@@ -74,11 +75,15 @@ function addChartContainerToPage(){
 	(document.getElementById("mainView") || document.body).appendChild(ele);
 	return ele;
 }
-function plotData(data, plotIndex){
+function plotData(data, plotIndex, expandData){
 	var p = fixedPlots[plotIndex];
 	if (p){
 		if (p.use){
-			p.graph.addValues(data);
+			if (expandData){
+				p.graph.addValues(...data);
+			}else{
+				p.graph.addValues(data);
+			}
 			p.graph.draw();
 		}
 	}else{