diff options
Diffstat (limited to 'source/use_case/kws_asr/src')
| -rw-r--r-- | source/use_case/kws_asr/src/MainLoop.cc | 8 | ||||
| -rw-r--r-- | source/use_case/kws_asr/src/UseCaseHandler.cc | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source/use_case/kws_asr/src/MainLoop.cc b/source/use_case/kws_asr/src/MainLoop.cc index 0638ecd..a4f7db9 100644 --- a/source/use_case/kws_asr/src/MainLoop.cc +++ b/source/use_case/kws_asr/src/MainLoop.cc @@ -17,7 +17,7 @@ #include "InputFiles.hpp" /* For input images. */ #include "Labels_micronetkws.hpp" /* For MicroNetKws label strings. */ #include "Labels_wav2letter.hpp" /* For Wav2Letter label strings. */ -#include "Classifier.hpp" /* KWS classifier. */ +#include "KwsClassifier.hpp" /* KWS classifier. */ #include "AsrClassifier.hpp" /* ASR classifier. */ #include "MicroNetKwsModel.hpp" /* KWS model class for running inference. */ #include "Wav2LetterModel.hpp" /* ASR model class for running inference. */ @@ -42,8 +42,6 @@ namespace app { } /* namespace app */ } /* namespace arm */ -using KwsClassifier = arm::app::Classifier; - enum opcodes { MENU_OPT_RUN_INF_NEXT = 1, /* Run on next vector. */ @@ -118,9 +116,9 @@ void main_loop() caseContext.Set<int>("asrFrameStride", arm::app::asr::g_FrameStride); caseContext.Set<float>("asrScoreThreshold", arm::app::asr::g_ScoreThreshold); /* Normalised score threshold. */ - KwsClassifier kwsClassifier; /* Classifier wrapper object. */ + arm::app::KwsClassifier kwsClassifier; /* Classifier wrapper object. */ arm::app::AsrClassifier asrClassifier; /* Classifier wrapper object. */ - caseContext.Set<arm::app::Classifier&>("kwsClassifier", kwsClassifier); + caseContext.Set<arm::app::KwsClassifier&>("kwsClassifier", kwsClassifier); caseContext.Set<arm::app::AsrClassifier&>("asrClassifier", asrClassifier); std::vector<std::string> asrLabels; diff --git a/source/use_case/kws_asr/src/UseCaseHandler.cc b/source/use_case/kws_asr/src/UseCaseHandler.cc index 9427ae0..c5e6ad3 100644 --- a/source/use_case/kws_asr/src/UseCaseHandler.cc +++ b/source/use_case/kws_asr/src/UseCaseHandler.cc @@ -143,11 +143,8 @@ namespace app { while (audioDataSlider.HasNext()) { const int16_t* inferenceWindow = audioDataSlider.Next(); - /* The first window does not have cache ready. */ - preProcess.m_audioWindowIndex = audioDataSlider.Index(); - /* Run the pre-processing, inference and post-processing. */ - if (!preProcess.DoPreProcess(inferenceWindow, audio::MicroNetKwsMFCC::ms_defaultSamplingFreq)) { + if (!preProcess.DoPreProcess(inferenceWindow, audioDataSlider.Index())) { printf_err("KWS Pre-processing failed."); return output; } |