diff options
| author | alexander <alexander.efremov@arm.com> | 2021-04-29 20:36:09 +0100 |
|---|---|---|
| committer | Alexander Efremov <alexander.efremov@arm.com> | 2021-05-04 19:57:44 +0000 |
| commit | c350cdced0a8a2ca17376f58813e6d48d796ac7c (patch) | |
| tree | f732cde664837a7cb9429b17e1366bb31a635b15 /source/use_case/ad/include | |
| parent | 6448932cc1c612d78e62c778ebb228b3cbe96a58 (diff) | |
| download | ml-embedded-evaluation-kit-c350cdced0a8a2ca17376f58813e6d48d796ac7c.tar.gz | |
MLECO-1868: Code static analyzer warnings fixes
Signed-off-by: alexander <alexander.efremov@arm.com>
Change-Id: Ie423e9cad3fabec6ab077ded7236813fe4933dea
Diffstat (limited to 'source/use_case/ad/include')
| -rw-r--r-- | source/use_case/ad/include/AdMelSpectrogram.hpp | 4 | ||||
| -rw-r--r-- | source/use_case/ad/include/AdModel.hpp | 4 | ||||
| -rw-r--r-- | source/use_case/ad/include/MelSpectrogram.hpp | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/source/use_case/ad/include/AdMelSpectrogram.hpp b/source/use_case/ad/include/AdMelSpectrogram.hpp index cf8a1d4..30a77c1 100644 --- a/source/use_case/ad/include/AdMelSpectrogram.hpp +++ b/source/use_case/ad/include/AdMelSpectrogram.hpp @@ -60,8 +60,8 @@ namespace audio { virtual bool ApplyMelFilterBank( std::vector<float>& fftVec, std::vector<std::vector<float>>& melFilterBank, - std::vector<int32_t>& filterBankFilterFirst, - std::vector<int32_t>& filterBankFilterLast, + std::vector<uint32_t>& filterBankFilterFirst, + std::vector<uint32_t>& filterBankFilterLast, std::vector<float>& melEnergies) override; /** diff --git a/source/use_case/ad/include/AdModel.hpp b/source/use_case/ad/include/AdModel.hpp index 2d83455..bbdf91c 100644 --- a/source/use_case/ad/include/AdModel.hpp +++ b/source/use_case/ad/include/AdModel.hpp @@ -41,10 +41,10 @@ namespace app { private: /* Maximum number of individual operations that can be enlisted */ - static constexpr int _ms_maxOpCnt = 6; + static constexpr int ms_maxOpCnt = 6; /* A mutable op resolver instance */ - tflite::MicroMutableOpResolver<_ms_maxOpCnt> _m_opResolver; + tflite::MicroMutableOpResolver<ms_maxOpCnt> _m_opResolver; }; } /* namespace app */ diff --git a/source/use_case/ad/include/MelSpectrogram.hpp b/source/use_case/ad/include/MelSpectrogram.hpp index c1dd61e..22b5d29 100644 --- a/source/use_case/ad/include/MelSpectrogram.hpp +++ b/source/use_case/ad/include/MelSpectrogram.hpp @@ -49,7 +49,7 @@ namespace audio { ~MelSpecParams() = default; /** @brief String representation of parameters */ - std::string Str(); + std::string Str() const; }; /** @@ -76,7 +76,7 @@ namespace audio { * @brief Constructor * @param[in] params - Mel Spectrogram parameters */ - MelSpectrogram(const MelSpecParams& params); + explicit MelSpectrogram(const MelSpecParams& params); MelSpectrogram() = delete; ~MelSpectrogram() = default; @@ -148,7 +148,7 @@ namespace audio { * bank weights and adding them up to be placed into * bins, according to the filter bank's first and last * indices (pre-computed for each filter bank element - * by _CreateMelFilterBank function). + * by CreateMelFilterBank function). * @param[in] fftVec Vector populated with FFT magnitudes * @param[in] melFilterBank 2D Vector with filter bank weights * @param[in] filterBankFilterFirst Vector containing the first indices of filter bank @@ -162,8 +162,8 @@ namespace audio { virtual bool ApplyMelFilterBank( std::vector<float>& fftVec, std::vector<std::vector<float>>& melFilterBank, - std::vector<int32_t>& filterBankFilterFirst, - std::vector<int32_t>& filterBankFilterLast, + std::vector<uint32_t>& filterBankFilterFirst, + std::vector<uint32_t>& filterBankFilterLast, std::vector<float>& melEnergies); /** @@ -195,33 +195,33 @@ namespace audio { std::vector<float> _m_melEnergies; std::vector<float> _m_windowFunc; std::vector<std::vector<float>> _m_melFilterBank; - std::vector<int32_t> _m_filterBankFilterFirst; - std::vector<int32_t> _m_filterBankFilterLast; + std::vector<uint32_t> _m_filterBankFilterFirst; + std::vector<uint32_t> _m_filterBankFilterLast; bool _m_filterBankInitialised; arm::app::math::FftInstance _m_fftInstance; /** * @brief Initialises the filter banks. **/ - void _InitMelFilterBank(); + void InitMelFilterBank(); /** * @brief Signals whether the instance of MelSpectrogram has had its * required buffers initialised * @return True if initialised, false otherwise **/ - bool _IsMelFilterBankInited(); + bool IsMelFilterBankInited() const; /** * @brief Create mel filter banks for Mel Spectrogram calculation. * @return 2D vector of floats **/ - std::vector<std::vector<float>> _CreateMelFilterBank(); + std::vector<std::vector<float>> CreateMelFilterBank(); /** * @brief Computes the magnitude from an interleaved complex array **/ - void _ConvertToPowerSpectrum(); + void ConvertToPowerSpectrum(); }; |