fixes and improved test page

Author: fquirin

src/modules/picovoice/porcupine-keywords/hey_google_wasm_19.js

@@ -1,4 +1,4 @@
-PorcupineKeywords.v19.Hey_Edison = new Uint8Array([
+PorcupineKeywords.v19.Hey_Google = new Uint8Array([
   0x51, 0x1b, 0x34, 0x5a, 0x57, 0xf4, 0x23, 0x97, 0x1b, 0x7c, 0xf6, 0x1c,
   0x1b, 0x88, 0x0b, 0xde, 0xfa, 0xa1, 0x73, 0xb0, 0x0e, 0xf7, 0x76, 0x44,
   0x7d, 0x64, 0xee, 0xfa, 0x1f, 0xda, 0x16, 0xc7, 0x1a, 0x53, 0x7f, 0xcf,

…ce/porcupine-keywords/picovoice_wasm.ppn …/porcupine-keywords/picovoice_wasm_19.jssrc/modules/picovoice/porcupine-keywords/picovoice_wasm.ppn renamed to src/modules/picovoice/porcupine-keywords/picovoice_wasm_19.js src/modules/picovoice/porcupine-keywords/picovoice_wasm.ppn renamed to src/modules/picovoice/porcupine-keywords/picovoice_wasm_19.js

@@ -1,3 +1,4 @@
+PorcupineKeywords.v19.Picovoice = new Uint8Array([
   0xf6, 0x73, 0x90, 0x32, 0x94, 0x86, 0xb4, 0xf3, 0xe5, 0x26, 0x9e, 0x20,
   0x05, 0x80, 0xeb, 0xd6, 0x22, 0x65, 0x94, 0x00, 0xdd, 0x0e, 0x7c, 0x5a,
   0x9e, 0xcd, 0xc3, 0xd4, 0x96, 0xae, 0xdb, 0x6d, 0x46, 0x39, 0x1e, 0x4e,
@@ -502,3 +503,4 @@
   0xf7, 0x47, 0x79, 0x9c, 0x87, 0x9f, 0xe0, 0x06, 0x7a, 0x31, 0xb8, 0x17,
   0x54, 0x4f, 0x81, 0x0c, 0xde, 0x1b, 0xb4, 0x68, 0x2c, 0x82, 0xef, 0x7a,
   0xd9, 0x1b, 0x88, 0x20, 0x6a, 0x7e, 0xa8, 0x74
+]);

src/modules/porcupine-wake-word-worker.js

@@ -131,7 +131,7 @@ function constructWorker(options) {
 
 	keywords = options.setup.keywords || ["Computer"];
 	keywords.forEach(function(kw){
-		importScripts('./picovoice/porcupine-keywords/' + kw.toLowerCase() + "_wasm_" + porcupineVersion + '.js');
+		importScripts('./picovoice/porcupine-keywords/' + kw.replace(/\s+/, "_").toLowerCase() + "_wasm_" + porcupineVersion + '.js');
 	});
 	sensitivities = options.setup.sensitivities || [0.5];
 

test.html

@@ -89,7 +89,12 @@ <h1>SEPIA Web Audio Processor</h1>
 	</div>
 	<div id="wakeWordWorkerControls" class="contorlGroup">
 		<label><b>Wake-Word</b></label>
-		<label>TBD - (Porcupine fixed values)</label>
+		<label>Buffer-Size:</label><input disabled placeholder="same as input atm.">
+		<label>Sensitivity:</label><input id="wakeWordSensitivity" class="small" type="number" value="0.7" max="1" min="0" step="0.1" placeholder="0=low, 1=high" onchange="setWakeWordSensitivity(+this.value);">
+		<label>Porcupine Version:</label><select id="porcupineVersionSelect" onchange="setPorcupineVersion(+this.value);">
+			<option value="14" selected>v1.4</option>
+			<option value="19">v1.9</option>
+		</select><div style="flex: 1 0 100%;"></div>
 		<label>Gate:</label><div id="wakeWordGateState"></div><label></label>
 		<label>Control:</label><button onclick="wakeWordSetGate('open');">Listen</button><button onclick="wakeWordSetGate('close');">Stop</button><label></label>
 	</div>
@@ -152,6 +157,7 @@ <h1>SEPIA Web Audio Processor</h1>
 			+ "Input Sample-Rate=" + info.inputSampleRate
 			+ " - Source-Type=" + info.sourceInfo.type;
 		console.log("onReady", info);
+		if (doUseWakeWordWorker) showLogMessage("Available wake-words", window.porcupineWorker.settings.options.setup.keywords);
 
 		//for testing:
 		if (!doUseWaveEncoder && rec.source.mediaStream) createMediaRecorder(rec.source.mediaStream, info.sourceInfo);
@@ -352,19 +358,19 @@ <h1>SEPIA Web Audio Processor</h1>
 			name: 'porcupine-wake-word-worker',
 			type: 'worker',
 			preLoad: {
-				wasmFile: 'src/modules/picovoice/porcupine-19.wasm'
+				wasmFile: (porcupineVersion == 14? 'src/modules/picovoice/porcupine-14.wasm' : 'src/modules/picovoice/porcupine-19.wasm')
 			},
 			settings: {
-				onmessage: console.log,		//TODO: change
+				onmessage: onWakeWordMessage,
 				//sendToModules: (doUseWaveEncoder? [waveEncoderIndex] : []),
 				options: {
 					setup: {
 						inputSampleRate: (doUseResampler? resamplerSampleRate : 0),
 						inputSampleSize: resamplerBufferSize,	//output bufferSize of previous module
-						bufferSize: 1024,	//TODO: change
-						version: 19,
-						keywords: ["Computer", "Jarvis"],
-						sensitivities: [0.5, 0.5]
+						bufferSize: resamplerBufferSize,		//TODO: this has no effect yet
+						version: porcupineVersion,
+						keywords: (porcupineVersion == 14? ["Hey SEPIA"] : ["Computer", "Jarvis", "Picovoice"]),
+						sensitivities: (porcupineVersion == 14? [0.7] : [0.7, 0.7, 0.7, 0.7])
 					}
 				}
 			}
@@ -581,6 +587,12 @@ <h1>SEPIA Web Audio Processor</h1>
 			}
 		}
 	}
+	function onWakeWordMessage(msg){
+		//console.log(msg);
+		if (msg && msg.keyword){
+			showLogMessage("Wake-word detected", msg.keyword);
+		}
+	}
 	function setVoiceActivity(data){
 		//console.log("vad", data);
 		if (data.voiceActivity != undefined){
@@ -782,6 +794,16 @@ <h1>SEPIA Web Audio Processor</h1>
 	var doUseWakeWordWorker = document.getElementById("useWakeWordWorker").checked;
 	var wakeWordGate = document.getElementById('wakeWordGateState');
 	var wakeWordGateOpen = false;
+	var wakeWordSensitivity = +document.getElementById("wakeWordSensitivity").value;
+	var porcupineVersion = +document.getElementById("porcupineVersionSelect").value;
+	function setWakeWordSensitivity(sense){
+		wakeWordSensitivity = sense;
+		console.log("wakeWordSensitivity", wakeWordSensitivity);
+	}
+	function setPorcupineVersion(version){
+		porcupineVersion = version;
+		console.log("porcupineVersion", porcupineVersion);
+	}
 	function wakeWordSetGate(state){
 		window.porcupineWorker.handle.sendToModule({gate: state});
 		//wakeWordGate.textContent = state;