diff options
author | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2022-04-06 13:03:20 +0100 |
---|---|---|
committer | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2022-04-06 16:03:23 +0100 |
commit | 68fdd119f38c37ab28066474086b0e352d991baf (patch) | |
tree | cedb897ff9128f7d07e54c5c53ff8eb6be6b2bb1 /source/use_case/kws_asr/src/UseCaseHandler.cc | |
parent | da2ec067da418d3d80b2829b111df25bd901eb5c (diff) | |
download | ml-embedded-evaluation-kit-68fdd119f38c37ab28066474086b0e352d991baf.tar.gz |
MLECO-3096: Removing data_acq and data_psn
Further to the HAL refactoring done in previous commits,
this CR simpifies HAL by removing data_acq and data_psn
"modules". The associated function pointers have been
removed.
Change-Id: I04c194c08dfe0aff98ce4e0f0f056bac254c137d
Signed-off-by: Kshitij Sisodia <kshitij.sisodia@arm.com>
Diffstat (limited to 'source/use_case/kws_asr/src/UseCaseHandler.cc')
-rw-r--r-- | source/use_case/kws_asr/src/UseCaseHandler.cc | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/source/use_case/kws_asr/src/UseCaseHandler.cc b/source/use_case/kws_asr/src/UseCaseHandler.cc index d598de6..1e1a400 100644 --- a/source/use_case/kws_asr/src/UseCaseHandler.cc +++ b/source/use_case/kws_asr/src/UseCaseHandler.cc @@ -53,11 +53,10 @@ namespace app { /** * @brief Presents kws inference results using the data presentation * object. - * @param[in] platform reference to the hal platform object * @param[in] results vector of classification results to be displayed * @return true if successful, false otherwise **/ - static bool PresentInferenceResult(hal_platform& platform, std::vector<arm::app::kws::KwsResult>& results); + static bool PresentInferenceResult(std::vector<arm::app::kws::KwsResult>& results); /** * @brief Presents asr inference results using the data presentation @@ -66,7 +65,7 @@ namespace app { * @param[in] results vector of classification results to be displayed * @return true if successful, false otherwise **/ - static bool PresentInferenceResult(hal_platform& platform, std::vector<arm::app::asr::AsrResult>& results); + static bool PresentInferenceResult(std::vector<arm::app::asr::AsrResult>& results); /** * @brief Returns a function to perform feature calculation and populates input tensor data with @@ -186,9 +185,8 @@ namespace app { std::vector<arm::app::kws::KwsResult> kwsResults; /* Display message on the LCD - inference running. */ - auto& platform = ctx.Get<hal_platform&>("platform"); std::string str_inf{"Running KWS inference... "}; - platform.data_psn->present_data_text( + hal_lcd_display_text( str_inf.c_str(), str_inf.size(), dataPsnTxtInfStartX, dataPsnTxtInfStartY, false); @@ -258,11 +256,11 @@ namespace app { /* Erase. */ str_inf = std::string(str_inf.size(), ' '); - platform.data_psn->present_data_text( + hal_lcd_display_text( str_inf.c_str(), str_inf.size(), dataPsnTxtInfStartX, dataPsnTxtInfStartY, false); - if (!PresentInferenceResult(platform, kwsResults)) { + if (!PresentInferenceResult(kwsResults)) { return output; } @@ -285,8 +283,7 @@ namespace app { constexpr uint32_t dataPsnTxtInfStartY = 40; auto& profiler = ctx.Get<Profiler&>("profiler"); - auto& platform = ctx.Get<hal_platform&>("platform"); - platform.data_psn->clear(COLOR_BLACK); + hal_lcd_clear(COLOR_BLACK); /* Get model reference. */ auto& asrModel = ctx.Get<Model&>("asrmodel"); @@ -356,7 +353,7 @@ namespace app { /* Display message on the LCD - inference running. */ std::string str_inf{"Running ASR inference... "}; - platform.data_psn->present_data_text( + hal_lcd_display_text( str_inf.c_str(), str_inf.size(), dataPsnTxtInfStartX, dataPsnTxtInfStartY, false); @@ -407,11 +404,11 @@ namespace app { /* Erase */ str_inf = std::string(str_inf.size(), ' '); - platform.data_psn->present_data_text( + hal_lcd_display_text( str_inf.c_str(), str_inf.size(), dataPsnTxtInfStartX, dataPsnTxtInfStartY, false); } - if (!PresentInferenceResult(platform, asrResults)) { + if (!PresentInferenceResult(asrResults)) { return false; } @@ -423,8 +420,7 @@ namespace app { /* Audio inference classification handler. */ bool ClassifyAudioHandler(ApplicationContext& ctx, uint32_t clipIndex, bool runAll) { - auto& platform = ctx.Get<hal_platform&>("platform"); - platform.data_psn->clear(COLOR_BLACK); + hal_lcd_clear(COLOR_BLACK); /* If the request has a valid size, set the audio index. */ if (clipIndex < NUMBER_OF_FILES) { @@ -457,14 +453,13 @@ namespace app { } - static bool PresentInferenceResult(hal_platform& platform, - std::vector<arm::app::kws::KwsResult>& results) + static bool PresentInferenceResult(std::vector<arm::app::kws::KwsResult>& results) { constexpr uint32_t dataPsnTxtStartX1 = 20; constexpr uint32_t dataPsnTxtStartY1 = 30; constexpr uint32_t dataPsnTxtYIncr = 16; /* Row index increment. */ - platform.data_psn->set_text_color(COLOR_GREEN); + hal_lcd_set_text_color(COLOR_GREEN); /* Display each result. */ uint32_t rowIdx1 = dataPsnTxtStartY1 + 2 * dataPsnTxtYIncr; @@ -484,7 +479,7 @@ namespace app { std::string{"s: "} + topKeyword + std::string{" ("} + std::to_string(static_cast<int>(score * 100)) + std::string{"%)"}; - platform.data_psn->present_data_text( + hal_lcd_display_text( resultStr.c_str(), resultStr.size(), dataPsnTxtStartX1, rowIdx1, 0); rowIdx1 += dataPsnTxtYIncr; @@ -502,13 +497,13 @@ namespace app { return true; } - static bool PresentInferenceResult(hal_platform& platform, std::vector<arm::app::asr::AsrResult>& results) + static bool PresentInferenceResult(std::vector<arm::app::asr::AsrResult>& results) { constexpr uint32_t dataPsnTxtStartX1 = 20; constexpr uint32_t dataPsnTxtStartY1 = 80; constexpr bool allow_multiple_lines = true; - platform.data_psn->set_text_color(COLOR_GREEN); + hal_lcd_set_text_color(COLOR_GREEN); /* Results from multiple inferences should be combined before processing. */ std::vector<arm::app::ClassificationResult> combinedResults; @@ -528,7 +523,7 @@ namespace app { std::string finalResultStr = audio::asr::DecodeOutput(combinedResults); - platform.data_psn->present_data_text( + hal_lcd_display_text( finalResultStr.c_str(), finalResultStr.size(), dataPsnTxtStartX1, dataPsnTxtStartY1, allow_multiple_lines); |