diff options
Diffstat (limited to 'source/application/main/include')
| -rw-r--r-- | source/application/main/include/Classifier.hpp | 2 | ||||
| -rw-r--r-- | source/application/main/include/DataStructures.hpp | 4 | ||||
| -rw-r--r-- | source/application/main/include/Mfcc.hpp | 24 | ||||
| -rw-r--r-- | source/application/main/include/Profiler.hpp | 4 |
4 files changed, 16 insertions, 18 deletions
diff --git a/source/application/main/include/Classifier.hpp b/source/application/main/include/Classifier.hpp index 510e6f9..3ee3148 100644 --- a/source/application/main/include/Classifier.hpp +++ b/source/application/main/include/Classifier.hpp @@ -62,7 +62,7 @@ namespace app { * @return true if successful, false otherwise. **/ template<typename T> - bool _GetTopNResults(TfLiteTensor* tensor, + bool GetTopNResults(TfLiteTensor* tensor, std::vector<ClassificationResult>& vecResults, uint32_t topNCount, const std::vector <std::string>& labels); diff --git a/source/application/main/include/DataStructures.hpp b/source/application/main/include/DataStructures.hpp index 5cc8b5e..2f267c0 100644 --- a/source/application/main/include/DataStructures.hpp +++ b/source/application/main/include/DataStructures.hpp @@ -47,15 +47,13 @@ namespace app { * @param[in] rows Number of rows. * @param[in] cols Number of columns. */ - Array2d(unsigned rows, unsigned cols) + Array2d(unsigned rows, unsigned cols): _m_rows(rows), _m_cols(cols) { if (rows == 0 || cols == 0) { printf_err("Array2d constructor has 0 size.\n"); _m_data = nullptr; return; } - _m_rows = rows; - _m_cols = cols; _m_data = new T[rows * cols]; } diff --git a/source/application/main/include/Mfcc.hpp b/source/application/main/include/Mfcc.hpp index 6379fab..dcafe62 100644 --- a/source/application/main/include/Mfcc.hpp +++ b/source/application/main/include/Mfcc.hpp @@ -52,7 +52,7 @@ namespace audio { ~MfccParams() = default; /** @brief String representation of parameters */ - std::string Str(); + std::string Str() const; }; /** @@ -100,7 +100,7 @@ namespace audio { const float quantScale, const int quantOffset) { - this->_MfccComputePreFeature(audioData); + this->MfccComputePreFeature(audioData); float minVal = std::numeric_limits<T>::min(); float maxVal = std::numeric_limits<T>::max(); @@ -154,7 +154,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 @@ -168,8 +168,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); /** @@ -214,37 +214,37 @@ namespace audio { std::vector<float> _m_windowFunc; std::vector<std::vector<float>> _m_melFilterBank; std::vector<float> _m_dctMatrix; - 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 and the DCT matrix. **/ - void _InitMelFilterBank(); + void InitMelFilterBank(); /** * @brief Signals whether the instance of MFCC has had its * required buffers initialised. * @return true if initialised, false otherwise. **/ - bool _IsMelFilterBankInited(); + bool IsMelFilterBankInited() const; /** * @brief Create mel filter banks for MFCC calculation. * @return 2D vector of floats. **/ - std::vector<std::vector<float>> _CreateMelFilterBank(); + std::vector<std::vector<float>> CreateMelFilterBank(); /** * @brief Computes and populates internal memeber buffers used * in MFCC feature calculation * @param[in] audioData 1D vector of 16-bit audio data. */ - void _MfccComputePreFeature(const std::vector<int16_t>& audioData); + void MfccComputePreFeature(const std::vector<int16_t>& audioData); /** @brief Computes the magnitude from an interleaved complex array. */ - void _ConvertToPowerSpectrum(); + void ConvertToPowerSpectrum(); }; diff --git a/source/application/main/include/Profiler.hpp b/source/application/main/include/Profiler.hpp index d93b257..c5f77e7 100644 --- a/source/application/main/include/Profiler.hpp +++ b/source/application/main/include/Profiler.hpp @@ -125,8 +125,8 @@ namespace app { * @param[in] name Name for the profiling unit series to be * appended to. **/ - void _AddProfilingUnit(time_counter start, time_counter end, - const std::string& name); + void AddProfilingUnit(time_counter start, time_counter end, + const std::string& name); }; } /* namespace app */ |