Non-working draft
This commit is contained in:
3
src/preAfter.js
Normal file
3
src/preAfter.js
Normal file
@@ -0,0 +1,3 @@
|
||||
`])))
|
||||
return new recognizer(rec,ctx)
|
||||
}
|
||||
@@ -1,17 +1,21 @@
|
||||
let objs = []
|
||||
class recognizer extends EventTarget {
|
||||
constructor(rec) {
|
||||
constructor(rec,ctx) {
|
||||
super()
|
||||
this.obj = rec
|
||||
this.ptr = Module._malloc(512)
|
||||
let channel = new MessageChannel()
|
||||
this.copier = new AudioWorkletNode(ctx, 'BRCopier', { channelCount: 1, numberOfInputs: 1, numberOfOutputs: 0 })
|
||||
this.copier.port.postMessage({cmd : "init", ptr: this.ptr},[channel.port1])
|
||||
channel.port1.onmessage = (ev) => {
|
||||
this.obj.acceptWaveForm(this.ptr, 512)
|
||||
}
|
||||
objs.push(this)
|
||||
}
|
||||
processAudio(ctx) {
|
||||
let ptr = Module._malloc(512);
|
||||
|
||||
this.obj.acceptWaveForm(ptr)
|
||||
}
|
||||
delete() {
|
||||
this.obj.delete()
|
||||
this.copier.port.postMessage({cmd : "deinit"})
|
||||
Module.free(this.ptr)
|
||||
}
|
||||
setWords(words) {
|
||||
this.obj.setWords(words)
|
||||
@@ -59,15 +63,14 @@ Module.makeSpkModel = async (url, path, id) => {
|
||||
}
|
||||
objs.push(mdl)
|
||||
return mdl
|
||||
}
|
||||
Module.makeRecognizer = async (model, sampleRate, ctx) => {
|
||||
}, ctx.AudioWorklet
|
||||
Module.makeRecognizer = async (model, ctx) => {
|
||||
let rec
|
||||
try {
|
||||
rec = new Module.recognizer(model,sampleRate, objs.length)
|
||||
rec = new Module.recognizer(model, ctx.sampleRate, objs.length)
|
||||
}
|
||||
catch(e) {
|
||||
rec.delete()
|
||||
return Promise.reject(e)
|
||||
}
|
||||
return new recognizer(rec)
|
||||
}
|
||||
await ctx.AudioWorklet.addModule(URL.createObjectURL(new Blob([`
|
||||
23
src/preMiddle.js
Normal file
23
src/preMiddle.js
Normal file
@@ -0,0 +1,23 @@
|
||||
registerProcessor("BRCopier", class extends AudioWorkletProcessor {
|
||||
constructor(options) {
|
||||
super(options)
|
||||
this.ret = true
|
||||
this.port.onmessage = (ev) => {
|
||||
switch(ev.cmd) {
|
||||
case "init":
|
||||
this.recognizerPort = ev.ports[0]
|
||||
this.wasmMem = new Float32Array(WebAssembly.Memory.buffer).subarray(ev.ptr, ev.ptr+512)
|
||||
break
|
||||
case "deinit":
|
||||
this.ret = false
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
process(inputs, outputs, params) {
|
||||
if(!this.ret) return false;
|
||||
inputs[0].copyFromChannel(this.wasmMem, 0)
|
||||
this.recognizerPort.postMessage("done")
|
||||
return true
|
||||
}
|
||||
})
|
||||
@@ -1,23 +0,0 @@
|
||||
registerProcessor("wasmMemCpy", class extends AudioWorkletProcessor {
|
||||
constructor(options) {
|
||||
super(options)
|
||||
this.retval = true
|
||||
this.port.onmessage = (ev) => {
|
||||
switch(ev.cmd) {
|
||||
case "init":
|
||||
this.ptr = ev.ptr
|
||||
this.wasmMem = ev.wasmMem
|
||||
this.recognizerPort = ev.ports[0]
|
||||
break
|
||||
case "deinit":
|
||||
this.retval = false
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
process(input, output, param) {
|
||||
const data = input[0][0]
|
||||
this.recognizerPort.postMessage("done")
|
||||
return this.retval
|
||||
}
|
||||
})
|
||||
@@ -1,27 +1,30 @@
|
||||
#include "recognizer.h"
|
||||
audioData::audioData(int addr, int len) : addr(reinterpret_cast<float*>(addr)), len(len) {}
|
||||
recognizer::recognizer(model* mdl, float sampleRate, int index) : index(index) {
|
||||
rec = vosk_recognizer_new(mdl->mdl,sampleRate);
|
||||
if(rec == nullptr) {
|
||||
throwJS("Unable to initialize recognizer");
|
||||
return;
|
||||
}
|
||||
controller.lock();
|
||||
std::thread t{[this](){
|
||||
while(!queue.empty()) {
|
||||
audioData data {queue.front()};
|
||||
queue.pop();
|
||||
switch(vosk_recognizer_accept_waveform_f(rec, data.addr, data.len)) {
|
||||
case 0:
|
||||
fireEv("result", vosk_recognizer_result(rec));
|
||||
break;
|
||||
case 1:
|
||||
fireEv("partialResult", vosk_recognizer_partial_result(rec));
|
||||
while(!done.test()) {
|
||||
controller.lock();
|
||||
if(!done.test()) {
|
||||
switch(vosk_recognizer_accept_waveform_f(rec, dataPtr, 512)) {
|
||||
case 0:
|
||||
fireEv("result", vosk_recognizer_result(rec));
|
||||
break;
|
||||
case 1:
|
||||
fireEv("partialResult", vosk_recognizer_partial_result(rec));
|
||||
}
|
||||
}
|
||||
}
|
||||
}};
|
||||
t.detach();
|
||||
}
|
||||
recognizer::~recognizer() {
|
||||
done.test_and_set(std::memory_order_relaxed);
|
||||
controller.unlock();
|
||||
vosk_recognizer_free(rec);
|
||||
}
|
||||
void recognizer::fireEv(const char *type, const char *content) {
|
||||
@@ -29,8 +32,9 @@ void recognizer::fireEv(const char *type, const char *content) {
|
||||
recognizers[$0].dispatchEvent(new CustomEvent(UTF8ToString($1), {"details" : UTF8ToString($2)}));
|
||||
},this->index, type, content);
|
||||
}
|
||||
void recognizer::acceptWaveForm(int addr, int len) {
|
||||
queue.emplace(addr, len);
|
||||
void recognizer::acceptWaveForm() {
|
||||
controller.unlock();
|
||||
controller.lock();
|
||||
}
|
||||
void recognizer::setGrm(const std::string& grm) {
|
||||
vosk_recognizer_set_grm(rec, grm.c_str());
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#include <filesystem>
|
||||
#include <atomic>
|
||||
#include <thread>
|
||||
#include <queue>
|
||||
|
||||
#include <emscripten/wasmfs.h>
|
||||
#include <emscripten/webaudio.h>
|
||||
@@ -16,17 +15,15 @@
|
||||
extern void throwJS(const char* msg, bool err = false);
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
struct audioData {
|
||||
float* addr{};
|
||||
int len{};
|
||||
audioData(int addr, int len);
|
||||
};
|
||||
struct recognizer {
|
||||
std::atomic_flag done{};
|
||||
std::mutex controller{};
|
||||
float* dataPtr{};
|
||||
int index{};
|
||||
VoskRecognizer* rec{};
|
||||
recognizer(model* model, float sampleRate, int index);
|
||||
~recognizer();
|
||||
void acceptWaveForm(int addr, int len);
|
||||
void acceptWaveForm();
|
||||
void fireEv(const char* type, const char* content);
|
||||
void setSpkModel(spkModel* model);
|
||||
void setGrm(const std::string& grm);
|
||||
|
||||
Reference in New Issue
Block a user