diff options
| author | Richard Burton <richard.burton@arm.com> | 2022-10-05 11:00:37 +0100 |
|---|---|---|
| committer | Richard Burton <richard.burton@arm.com> | 2022-10-06 14:08:13 +0100 |
| commit | ec5e99be3ae6dd0d3811950f155b01e144431452 (patch) | |
| tree | a5d6c4dd9267db2465063b8d0e1a5cb6d19dac8d /source/use_case/kws/src/UseCaseHandler.cc | |
| parent | 890b2b89cacc6f2291596a001d555d374c8c9edd (diff) | |
| download | ml-embedded-evaluation-kit-ec5e99be3ae6dd0d3811950f155b01e144431452.tar.gz | |
MLECO-3164: Additional refactoring of KWS API
Part 1
* Add KwsClassifier
* KwsPostProcess can now be told to average results
* Averaging is handlded by KwsClassifier
* Current sliding window index is now an argument of DoPreProcess
Change-Id: I07626da595ad1cbd982e8366f0d1bb56d1040459
Diffstat (limited to 'source/use_case/kws/src/UseCaseHandler.cc')
| -rw-r--r-- | source/use_case/kws/src/UseCaseHandler.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/use_case/kws/src/UseCaseHandler.cc b/source/use_case/kws/src/UseCaseHandler.cc index 61c6eb6..d61ba9d 100644 --- a/source/use_case/kws/src/UseCaseHandler.cc +++ b/source/use_case/kws/src/UseCaseHandler.cc @@ -17,7 +17,7 @@ #include "UseCaseHandler.hpp" #include "InputFiles.hpp" -#include "Classifier.hpp" +#include "KwsClassifier.hpp" #include "MicroNetKwsModel.hpp" #include "hal.h" #include "AudioUtils.hpp" @@ -29,8 +29,6 @@ #include <vector> -using KwsClassifier = arm::app::Classifier; - namespace arm { namespace app { @@ -124,14 +122,11 @@ namespace app { while (audioDataSlider.HasNext()) { const int16_t* inferenceWindow = audioDataSlider.Next(); - /* The first window does not have cache ready. */ - preProcess.m_audioWindowIndex = audioDataSlider.Index(); - info("Inference %zu/%zu\n", audioDataSlider.Index() + 1, audioDataSlider.TotalStrides() + 1); /* Run the pre-processing, inference and post-processing. */ - if (!preProcess.DoPreProcess(inferenceWindow, audio::MicroNetKwsMFCC::ms_defaultSamplingFreq)) { + if (!preProcess.DoPreProcess(inferenceWindow, audioDataSlider.Index())) { printf_err("Pre-processing failed."); return false; } |