comparison dsp/keydetection/GetKeyMode.cpp @ 40:163f6e03e9e7

* Add key strength output; increase chromagram lower bound so as to shorten
  hop size

 { 0.0375, 0.0682, 0.0299, 0.0119, 0.0138, 0.0093, 0.0296, 0.0543, 0.0257,
   0.0292, 0.0519, 0.0246, 0.0159, 0.0234, 0.0135, 0.0291, 0.0544, 0.0248,
   0.0137, 0.0176, 0.0104, 0.0352, 0.0670, 0.0302, 0.0222, 0.0349, 0.0164,
   0.0174, 0.0297, 0.0166, 0.0222, 0.0401, 0.0202, 0.0175, 0.0270, 0.0146};
 //
+    
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 

     m_MeanHPCP(0),
     m_MajCorr(0),
     m_MinCorr(0),
     m_Keys(0),
     m_MedianFilterBuffer(0),
-    m_SortedBuffer(0)
+    m_SortedBuffer(0),
+    m_keyStrengths(0)
 {
     m_DecimationFactor = 8;
         
     // Chromagram configuration parameters
     m_ChromaConfig.normalise = MathUtilities::NormaliseUnitMax;
     m_ChromaConfig.FS = lrint(sampleRate/(double)m_DecimationFactor);
 
     // Set C (= MIDI #12) as our base :
     // This implies that key = 1 => Cmaj, key = 12 => Bmaj, key = 13 => Cmin, etc.
     m_ChromaConfig.min = Pitch::getFrequencyForPitch
-        (12, 0, tuningFrequency);
+        (48, 0, tuningFrequency);
     m_ChromaConfig.max = Pitch::getFrequencyForPitch
         (96, 0, tuningFrequency);
 
     m_ChromaConfig.BPO = 36;
     m_ChromaConfig.CQThresh = 0.0054;

     m_ChromaFrameSize = m_Chroma->getFrameSize();
     // override hopsize for this application
     m_ChromaHopSize = m_ChromaFrameSize;
     m_BPO = m_ChromaConfig.BPO;
 
+//    std::cerr << "chroma frame size = " << m_ChromaFrameSize << ", decimation factor = " << m_DecimationFactor << " therefore block size = " << getBlockSize() << std::endl;
+
     // Chromagram average and estimated key median filter lengths
     m_ChromaBuffersize = (int)ceil( m_hpcpAverage * m_ChromaConfig.FS/m_ChromaFrameSize );
     m_MedianWinsize = (int)ceil( m_medianAverage * m_ChromaConfig.FS/m_ChromaFrameSize );
     
     // Reset counters

     m_SortedBuffer = new int[ m_MedianWinsize ];
     memset( m_SortedBuffer, 0, sizeof(int)*m_MedianWinsize);	
     
     m_Decimator = new Decimator
         ( m_ChromaFrameSize*m_DecimationFactor, m_DecimationFactor );
+
+    m_keyStrengths = new double[24];
 }
 
 GetKeyMode::~GetKeyMode()
 {
 

     delete [] m_MajCorr;
     delete [] m_MinCorr;
     delete [] m_Keys;
     delete [] m_MedianFilterBuffer;
     delete [] m_SortedBuffer;
+
+    delete[] m_keyStrengths;
 }
 
 double GetKeyMode::krumCorr(double *pData1, double *pData2, unsigned int length)
 {
     double retVal= 0.0;

     {
         m_Keys[k] = m_MajCorr[k];
         m_Keys[k+m_BPO] = m_MinCorr[k];
     }
 
+    for (k = 0; k < 24; ++k) {
+        m_keyStrengths[k] = 0;
+    }
+
+    for( k = 0; k < m_BPO*2; k++ )
+    {
+        m_keyStrengths[k/(m_BPO/12)] += m_Keys[k];
+    }
 
 /*
   std::cout << "raw keys: ";
   for (int ii = 0; ii < 2*m_BPO; ++ii) {
   std::cout << m_Keys[ii] << " ";