comparison dsp/chromagram/Chromagram.cpp @ 51:114e833c07ac

* Do not calculate CQ sparse kernel when chromagram is constructed: only
  when it's actually used
* Pre-calculate CQ sparse kernels in the sizes required for the default
  configurations of some of our transforms

 #include "maths/MathUtilities.h"
 #include "Chromagram.h"
 
 //----------------------------------------------------------------------------
 
-Chromagram::Chromagram( ChromaConfig Config ) 
+Chromagram::Chromagram( ChromaConfig Config ) :
+    m_skGenerated(false)
 {
     initialise( Config );
 }
 
 int Chromagram::initialise( ChromaConfig Config )

     m_CQIm  = new double[ m_uK ];
 
     m_window = 0;
     m_windowbuf = 0;
 
-    // Generate CQ Kernel 
-    m_ConstantQ->sparsekernel();
     return 1;
 }
 
 Chromagram::~Chromagram()
 {

 }
 
 
 double* Chromagram::process( const double *data )
 {
+    if (!m_skGenerated) {
+        // Generate CQ Kernel 
+        m_ConstantQ->sparsekernel();
+        m_skGenerated = true;
+    }
+
     if (!m_window) {
         m_window = new Window<double>(HammingWindow, m_frameSize);
         m_windowbuf = new double[m_frameSize];
     }
 

     return process(m_FFTRe, m_FFTIm);
 }
 
 double* Chromagram::process( const double *real, const double *imag )
 {
+    if (!m_skGenerated) {
+        // Generate CQ Kernel 
+        m_ConstantQ->sparsekernel();
+        m_skGenerated = true;
+    }
+
     // initialise chromadata to 0
     for (unsigned i = 0; i < m_BPO; i++) m_chromadata[i] = 0;
 
     double cmax = 0.0;
     double cval = 0;