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

Overload constructor of recognizer, maximal debug configuration

Browse Source
This commit is contained in:
msqr1
2024-02-20 23:12:08 -08:00
parent 0f9cf2916e
commit a0898a6bf1
10 changed files with 13883 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/recognizer.cc
View File

@@ -3,31 +3,23 @@
recognizer::recognizer(model* mdl, float sampleRate, int index) : index(index) {
auto main{[this, mdl, sampleRate](){
rec = vosk_recognizer_new(mdl->mdl,sampleRate);
if(rec == nullptr) {
fireEv("_continue", "Unable to initialize recognizer", this->index);
return;
}
fireEv("_continue", nullptr, this->index);
while(!done.test(std::memory_order_relaxed)) {
controller.wait(!done.test(std::memory_order_relaxed), std::memory_order_relaxed);
controller.clear(std::memory_order_relaxed);
if(done.test(std::memory_order_relaxed)) continue;
switch(vosk_recognizer_accept_waveform_f(rec, dataPtr, 512)) {
case 0:
fireEv("result", vosk_recognizer_result(rec), this->index);
break;
case 1:
fireEv("partialResult", vosk_recognizer_partial_result(rec), this->index);
}
}
finishConstruction();
}};
if(mdl->recognizerUsedThrd) {
mdl->thrd.addTask(main);
mdl->recognizerUsedThrd = true;
return;
}
std::thread t{main};
t.detach();
tryStealMdlThrd(main, mdl);
}
recognizer::recognizer(model* mdl, spkModel* spkMdl, float sampleRate, int index) {
auto main{[this, mdl, sampleRate, spkMdl](){
rec = vosk_recognizer_new_spk(mdl->mdl, sampleRate, spkMdl->mdl);
finishConstruction();
}};
tryStealMdlThrd(main, mdl);
}
recognizer::recognizer(model* mdl, const std::string& grm, float sampleRate, int index, int dummy) {
auto main{[this, mdl, sampleRate, grm](){
rec = vosk_recognizer_new_grm(mdl->mdl, sampleRate, grm.c_str());
finishConstruction();
}};
tryStealMdlThrd(main, mdl);
}
recognizer::~recognizer() {
done.test_and_set(std::memory_order_relaxed);
@@ -37,7 +29,34 @@ recognizer::~recognizer() {
vosk_recognizer_free(rec);
free(dataPtr);
}
void recognizer::tryStealMdlThrd(std::function<void()>&& main, model* mdl) {
if(mdl->recognizerUsedThrd) {
mdl->thrd.addTask(std::move(main));
mdl->recognizerUsedThrd = true;
return;
}
std::thread t{main};
t.detach();
}
void recognizer::finishConstruction() {
if(rec == nullptr) {
fireEv("_continue", "Unable to initialize recognizer", this->index);
return;
}
fireEv("_continue", nullptr, this->index);
while(!done.test(std::memory_order_relaxed)) {
controller.wait(!done.test(std::memory_order_relaxed), std::memory_order_relaxed);
controller.clear(std::memory_order_relaxed);
if(done.test(std::memory_order_relaxed)) continue;
switch(vosk_recognizer_accept_waveform_f(rec, dataPtr, 512)) {
case 0:
fireEv("result", vosk_recognizer_result(rec), this->index);
break;
case 1:
fireEv("partialResult", vosk_recognizer_partial_result(rec), this->index);
}
}
}
void recognizer::acceptWaveForm() {
controller.test_and_set(std::memory_order_relaxed);
controller.notify_one();