comparison Spectrogram.cpp @ 11:09fb76606b2b

* Removed many unnecessary heap allocations with objects

 
 #include "Spectrogram.h"
 using namespace std;
 using Vamp::FFT;
 
-Spectrogram::Spectrogram(unsigned int inputLength, unsigned int windowLength, unsigned int fftLength, unsigned int hopSize) :
+SpectrogramProcessor::SpectrogramProcessor(unsigned int inputLength, unsigned int windowLength, unsigned int fftLength, unsigned int hopSize) :
     m_inputLength(inputLength),
     m_windowLength(windowLength),
     m_fftLength(fftLength),
     m_hopSize(hopSize),
     m_numberOfOutputBins(ceil(fftLength/2) + 1),

     fftOutputImag(NULL)
 {
     initialise();
 }
 
-Spectrogram::~Spectrogram(){
+SpectrogramProcessor::~SpectrogramProcessor(){
     cleanup();
 }
 
-void Spectrogram::initialise(){
+void SpectrogramProcessor::initialise(){
     fftInput = new double [m_fftLength];
     fftOutputReal = new double [m_fftLength];
     fftOutputImag = new double [m_fftLength];
     
     int numberOfBlocks = ceil(m_inputLength/m_hopSize) + 2*(ceil(m_windowLength/m_hopSize)-1); //The last term corresponds to overlaps at the beginning and end with padded zeros. I.e., if m_hopSize = m_windowLength/2, there'll be 1 overlap at each end. If m_hopSize = m_windowLength/4, there'll be 3 overlaps at each end, etc...
     spectrogramOutput = vector< vector<float> >(m_numberOfOutputBins, vector<float>(numberOfBlocks));
 }
 
-void Spectrogram::cleanup(){
+void SpectrogramProcessor::cleanup(){
     delete []fftInput;
     delete []fftOutputReal;
     delete []fftOutputImag;
     
     fftInput = fftOutputReal = fftOutputImag = NULL;
 }
 
 //process method
-vector< vector<float> > Spectrogram::audioToMagnitudeSpectrogram(const float * const input, const float * window){
+vector< vector<float> > SpectrogramProcessor::process(const float * const input, const float * window){
     
     int readPointerBeginIndex = m_hopSize-m_windowLength;
     int writeBlockPointer = 0;
     
     while(readPointerBeginIndex < m_inputLength){