Mercurial > hg > vamp-tempogram
diff Spectrogram.h @ 13:7680cc4c0073
* Tidying - made length of array variables type size_t and for loops unsigned int, where index > 0.
* Window length parameter is now a dropdown box.
author | Carl Bussey <c.bussey@se10.qmul.ac.uk> |
---|---|
date | Wed, 13 Aug 2014 14:18:00 +0100 |
parents | 09fb76606b2b |
children |
line wrap: on
line diff
--- a/Spectrogram.h Wed Aug 13 10:47:39 2014 +0100 +++ b/Spectrogram.h Wed Aug 13 14:18:00 2014 +0100 @@ -12,23 +12,26 @@ #include <vamp-sdk/FFT.h> #include <cmath> +typedef std::vector <std::vector<float> > Spectrogram; +typedef std::vector <std::vector<float> > SpectrogramTransposed; + class SpectrogramProcessor{ - int m_inputLength; - int m_windowLength; - int m_fftLength; - int m_hopSize; - int m_numberOfOutputBins; - double * fftInput; - double * fftOutputReal; - double * fftOutputImag; - std::vector< std::vector <float> > spectrogramOutput; + size_t m_inputLength; + size_t m_windowLength; + size_t m_fftLength; + size_t m_hopSize; + size_t m_numberOfOutputBins; + double * m_pFftInput; + double * m_pFftOutputReal; + double * m_pFftOutputImag; void initialise(); void cleanup(); public: - std::vector< std::vector<float> > process(const float * const input, const float * window); - SpectrogramProcessor(unsigned int inputLength, unsigned int windowLength, unsigned int fftLength, unsigned int hopSize); + SpectrogramProcessor(const size_t &inputLength, const size_t &windowLength, const size_t &fftLength, const size_t &hopSize); ~SpectrogramProcessor(); + + std::vector< std::vector<float> > process(const float * const pInput, const float * pWindow) const; }; #endif /* defined(__Tempogram__Spectrogram__) */