patrick/Vosklet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draft 2 (failed)

Browse Source
This commit is contained in:
msqr1
2024-01-18 23:47:10 -08:00
parent 97ba7ee1b8
commit 91a21271d5
22 changed files with 350 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bindings.cc
View File

@@ -2,6 +2,13 @@
#include "model.h"
#include "recognizer.h"
using namespace emscripten;
int main() {
//vosk_set_log_level(-1);
std::thread t{[](){
wasmfs_create_directory("/opfs",0777,wasmfs_create_opfs_backend());
}};
t.detach();
}
EMSCRIPTEN_BINDINGS() {
function("setLogLevel", &vosk_set_log_level, allow_raw_pointers());
class_<model>("__model__")
@@ -14,7 +21,6 @@ EMSCRIPTEN_BINDINGS() {
.constructor<model*, int, int>(allow_raw_pointers())
.function("start", &recognizer::start, allow_raw_pointers())
.function("stop", &recognizer::stop, allow_raw_pointers())
.function("deinit", &recognizer::deinit, allow_raw_pointers())
.function("setWords", &recognizer::setWords, allow_raw_pointers())
.function("setPartialWords", &recognizer::setPartialWords, allow_raw_pointers())
.function("setGrm", &recognizer::setGrm, allow_raw_pointers())

16
src/clapack-wasm.patch Normal file
View File

@@ -0,0 +1,16 @@
diff --git a/libf2c/main.c b/libf2c/main.c
index d95fdc9..ac82f68 100644
--- a/libf2c/main.c
+++ b/libf2c/main.c
@@ -105,9 +105,9 @@ char **xargv;
int
#ifdef KR_headers
-main(argc, argv) int argc; char **argv;
+m(argc, argv) int argc; char **argv;
#else
-main(int argc, char **argv)
+m(int argc, char **argv)
#endif
{
xargc = argc;

36
src/genericModel.cc
View File

@@ -1,21 +1,9 @@
#include "genericModel.h"
bool genericModel::first = true;
genericModel::genericModel(const std::string &url, const std::string& storepath, const std::string &id, int index) : url(url), id(id), genericObj(index) {
fs::current_path("/opfs");
fs::create_directories(storepath);
fs::current_path(storepath);
if(first) {
vosk_set_log_level(0);
int res{};
std::thread t{[&res](){
res = wasmfs_create_directory("opfs",0777,wasmfs_create_opfs_backend());
}};
t.join();
if(res == 1){
fireEv("error", "Unable to create OPFS directory");
return;
}
first = false;
}
}
bool genericModel::checkId(const std::string& id) {
std::ifstream file {"id", std::ifstream::binary};
@@ -28,42 +16,46 @@ bool genericModel::checkId(const std::string& id) {
file.read(&oldid[0], size);
return id.compare(oldid) == 0 ? true : false;
}
bool genericModel::loadModel() {
bool genericModel::loadModel(const std::string& storepath) {
if(!checkModel() || !checkId(id)) {
if(emscripten_wget(url.c_str(),"opfs/model.tzst") == 1) {
char filename[] {"/opfs/XXXXXX.tzst"};
close(mkostemps(filename, 5, O_PATH));
if(emscripten_wget(url.c_str(),filename) == 1) {
fireEv("error", "Unable to fetch model");
return false;
}
if(!extractModel()) {
if(!extractModel(filename)) {
fireEv("error", "Unable to extract model");
return false;
}
fs::remove("opfs/model.tzst");
fs::remove(filename);
if(!checkModel()) {
fireEv("error", "Model URL contains invalid model files");
fs::remove_all(".");
fs::current_path("/opfs");
fs::remove_all(storepath);
return false;
}
std::ofstream idFile("id");
if(!idFile.is_open()) {
fireEv("error", "Unable to write new id");
fs::remove_all(".");
fs::remove_all(storepath);
return false;
}
idFile << id;
}
return true;
}
bool genericModel::extractModel() {
bool genericModel::extractModel(char* name) {
std::string path{};
archive* src {archive_read_new()};
archive_entry* entry {};
archive_read_support_filter_all(src);
archive_read_support_format_all(src);
archive_read_open_filename(src, "opfs/model.tzst",10240);
archive_read_open_filename(src, name,10240);
if(archive_errno(src) != 0) return false;
while (archive_read_next_header(src, &entry) == ARCHIVE_OK) {
path = archive_entry_pathname(entry);
// Strip first component
archive_entry_set_pathname(entry, path.substr(path.find("/")).c_str());
if(archive_errno(src) != 0) return false;
archive_read_extract(src, entry, ARCHIVE_EXTRACT_UNLINK);

8
src/genericModel.h
View File

@@ -6,6 +6,7 @@
#include <fstream>
#include <thread>
#include <fcntl.h>
#include <vosk_api.h>
#include <archive.h>
#include <archive_entry.h>
@@ -15,12 +16,11 @@
namespace fs = std::filesystem;
struct genericModel : genericObj {
static bool first;
const std::string url{};
const std::string id{};
static bool extractModel();
static bool extractModel(char *name);
static bool checkId(const std::string& id);
virtual bool checkModel() = 0;
bool loadModel();
genericModel(const std::string& url, const std::string& storepath, const std::string& id, int index);
bool loadModel(const std::string& storepath);
genericModel(const std::string &url, const std::string &storepath, const std::string &id, int index);
};

12
src/genericObj.cc
View File

@@ -1,13 +1,11 @@
#include "genericObj.h"
void genericObj::fireEv(const char *type, const char *content) {
if(content == nullptr) {
EM_ASM({
__genericObj__.objects[$0].dispatchEvent(new Event(UTF8ToString($1)));
},this->index, type);
return;
}
EM_ASM({
__genericObj__.objects[$0].dispatchEvent(new CustomEvent(UTF8ToString($0), {"details" : UTF8ToString($1)}));
if($0 === 0) {
__genericObj__.objects[$0].dispatchEvent(new Event(UTF8ToString($1)));
return;
}
__genericObj__.objects[$0].dispatchEvent(new CustomEvent(UTF8ToString($1), {"details" : UTF8ToString($2)}));
},this->index, type, content);
}

3
src/genericObj.js
View File

@@ -1 +1,2 @@
class __genericObj__ {static objects = []}
class __genericObj__ {static objects = []}

13
src/kaldi.patch
View File

@@ -25,18 +25,7 @@ index 4573e24f1..4af4e73ea 100644
MultiThreadable::~MultiThreadable() {
// default implementation does nothing
diff --git a/src/base/kaldi-types.h b/src/base/kaldi-types.h
index 7ebf4f853..2f5979e42 100644
--- a/src/base/kaldi-types.h
+++ b/src/base/kaldi-types.h
@@ -20,6 +20,7 @@
#ifndef KALDI_BASE_KALDI_TYPES_H_
#define KALDI_BASE_KALDI_TYPES_H_ 1
+#define KALDI_DOUBLEPRECISION 1
namespace kaldi {
// TYPEDEFS ..................................................................
diff --git a/src/ivector/ivector-extractor.cc b/src/ivector/ivector-extractor.cc
index c3a122281..71d37256d 100644
--- a/src/ivector/ivector-extractor.cc

6
src/model.cc
View File

@@ -1,7 +1,7 @@
#include "model.h"
model::model(const std::string &url, const std::string& storepath, const std::string& id, int index) : genericModel(url, id, storepath, index) {
if(!loadModel()) return;
if(!loadModel(storepath)) return;
mdl = vosk_model_new(".");
if(mdl == nullptr) {
fireEv("error", "Unable to initialize model");
@@ -9,7 +9,9 @@ model::model(const std::string &url, const std::string& storepath, const std::st
}
fireEv("ready");
};
model::~model() {
vosk_model_free(mdl);
}
bool model::checkModel() {
return fs::exists("am/final.mdl") &&
fs::exists("conf/mfcc.conf") &&

1
src/model.h
View File

@@ -5,6 +5,7 @@ struct model : genericModel {
bool checkModel();
VoskModel* mdl{};
model(const std::string &url, const std::string& storepath, const std::string& id, int index);
~model();
};

6
src/model.js
View File

@@ -3,12 +3,10 @@ class Model extends EventTarget{
super()
}
init(url, storepath, id) {
this.obj = new Module.__model__(url, storepath, id, __genericObj__.objects.length);
this.obj = new BrowserRecognizer.__model__(url, storepath, id, __genericObj__.objects.length);
__genericObj__.objects.push(this)
}
delete() {
this.obj.then(() => {
this.obj.delete()
})
this.obj.delete()
}
}

34
src/recognizer.cc
View File

@@ -7,11 +7,6 @@ void recognizer::stop() {
controller.clear(std::memory_order_relaxed);
controller.notify_all();
}
void recognizer::deinit() {
done.test_and_set(std::memory_order_relaxed);
done.notify_all();
stop();
}
recognizer::recognizer(model* mdl, int sampleRate, int index) : genericObj(index) {
mic = alcCaptureOpenDevice("Emscripten OpenAL capture",sampleRate, AL_FORMAT_MONO16, 22480);
if(alcGetError(mic) != 0) {
@@ -25,32 +20,15 @@ recognizer::recognizer(model* mdl, int sampleRate, int index) : genericObj(index
}
main();
}
void recognizer::main() {
char buffer[22480];
int sample{};
fireEv("ready");
while(!done.test()) {
controller.wait(done.test(std::memory_order_relaxed), std::memory_order_relaxed);
alcCaptureStart(mic);
while(controller.test()) {
alcGetIntegerv(mic, ALC_CAPTURE_SAMPLES, sizeof(int), &sample);
alcCaptureSamples(mic, buffer, sample);
switch(vosk_recognizer_accept_waveform(rec, buffer, 22480)) {
case 0:
fireEv("result", vosk_recognizer_result(rec));
break;
case 1:
fireEv("partialResult", vosk_recognizer_partial_result(rec));
break;
default:
fireEv("error", "Recognition result error");
}
}
alcCaptureStop(mic);
}
recognizer::~recognizer() {
done.test_and_set(std::memory_order_relaxed);
done.notify_all();
stop();
vosk_recognizer_free(rec);
alcCaptureCloseDevice(mic);
}
void recognizer::acceptWaveForm() {
}
void recognizer::setGrm(const std::string& grm) {
vosk_recognizer_set_grm(rec, grm.c_str());
}

6
src/recognizer.h
View File

@@ -19,13 +19,11 @@ namespace fs = std::filesystem;
struct recognizer : genericObj {
VoskRecognizer* rec{};
ALCdevice* mic{};
std::atomic_flag done {false};
std::atomic_flag controller{false};
void main();
void acceptWaveForm();
recognizer(model* model, int sampleRate, int index);
~recognizer();
void start();
void stop();
void deinit();
void setSpkModel(spkModel* model);
void setGrm(const std::string& grm);
void setWords(bool words);

3
src/recognizer.js
View File

@@ -4,7 +4,7 @@ class Recognizer extends EventTarget {
}
init(model) {
ctx = new (AudioContext || webkitAudioContext)()
new Module.__recognizer__(model.obj,ctx.sampleRate,__genericObj__.objects.length)
new BrowserRecognizer.__recognizer__(model.obj,ctx.sampleRate,__genericObj__.objects.length)
ctx.close()
__genericObj__.objects.push(this)
}
@@ -15,7 +15,6 @@ class Recognizer extends EventTarget {
this.obj.stop()
}
delete() {
this.obj.deinit()
this.obj.delete()
}
setWords(words) {

5
src/spkModel.cc
View File

@@ -1,12 +1,15 @@
#include "spkModel.h"
spkModel::spkModel(const std::string &url, const std::string& storepath, const std::string& id, int index) : genericModel(url, storepath, id, index) {
if(!loadModel()) return;
if(!loadModel(storepath)) return;
mdl = vosk_spk_model_new(".");
if(mdl == nullptr) {
fireEv("error", "Unable to initialize speaker model");
}
fireEv("ready");
};
spkModel::~spkModel() {
vosk_spk_model_free(mdl);
}
bool spkModel::checkModel() {
return fs::exists("mfcc.conf") &&
fs::exists("final.ext.raw") &&

3
src/spkModel.h
View File

@@ -3,8 +3,9 @@
struct spkModel : genericModel {
bool checkModel();
spkModel(const std::string &url, const std::string& storepath, const std::string& id, const int index);
VoskSpkModel* mdl{};
spkModel(const std::string &url, const std::string& storepath, const std::string& id, const int index);
~spkModel();
};

2
src/spkModel.js
View File

@@ -3,7 +3,7 @@ class SpkModel extends EventTarget{
super()
}
init(url, storepath, id) {
this.obj = new Module.__spkModel__(url, storepath, id, __genericObj__.objects.length)
this.obj = new BrowserRecognizer.__spkModel__(url, storepath, id, __genericObj__.objects.length)
__genericObj__.objects.push(this)
}
delete() {