comparison plugins/SimilarityPlugin.cpp @ 60:90fa946fda40

* Add key strength plot to key detector
* Fix vector overrun in similarity plugin if some empty frames have been
  encountered
* Fix uninitialised m_count in MFCC plugin
* Doc update

     m_blockSize = blockSize;
     m_channels = channels;
 
     m_lastNonEmptyFrame = std::vector<int>(m_channels);
     for (int i = 0; i < m_channels; ++i) m_lastNonEmptyFrame[i] = -1;
+
+    m_emptyFrameCount = std::vector<int>(m_channels);
+    for (int i = 0; i < m_channels; ++i) m_emptyFrameCount[i] = 0;
+
     m_frameNo = 0;
 
     int decimationFactor = getDecimationFactor();
     if (decimationFactor > 1) {
         m_decimator = new Decimator(m_blockSize, decimationFactor);

     
     if (needRhythm()) {
         m_rhythmClipFrames =
             int(ceil((m_rhythmClipDuration * m_processRate) 
                      / m_rhythmClipFrameSize));
-        std::cerr << "SimilarityPlugin::initialise: rhythm clip is "
-                  << m_rhythmClipFrames << " frames of size "
-                  << m_rhythmClipFrameSize << " at process rate "
-                  << m_processRate << " ( = "
-                  << (float(m_rhythmClipFrames * m_rhythmClipFrameSize) / m_processRate) << " sec )"
-                  << std::endl;
+//        std::cerr << "SimilarityPlugin::initialise: rhythm clip requires "
+//                  << m_rhythmClipFrames << " frames of size "
+//                  << m_rhythmClipFrameSize << " at process rate "
+//                  << m_processRate << " ( = "
+//                  << (float(m_rhythmClipFrames * m_rhythmClipFrameSize) / m_processRate) << " sec )"
+//                  << std::endl;
 
         MFCCConfig config(m_processRate);
         config.fftsize = m_rhythmClipFrameSize;
         config.nceps = m_featureColumnSize - 1;
         config.want_c0 = true;

         m_values[i].clear();
     }
 
     for (int i = 0; i < m_rhythmValues.size(); ++i) {
         m_rhythmValues[i].clear();
+    }
+
+    for (int i = 0; i < m_lastNonEmptyFrame.size(); ++i) {
+        m_lastNonEmptyFrame[i] = -1;
+    }
+
+    for (int i = 0; i < m_emptyFrameCount.size(); ++i) {
+        m_emptyFrameCount[i] = 0;
     }
 
     m_done = false;
 }
 

                         }
                         m_rhythmValues[c].push_back(mf);
                     }
                 }
             }
+            m_emptyFrameCount[c]++;
             continue;
         }
 
         m_lastNonEmptyFrame[c] = m_frameNo;
 

             int count;
 
             // We want to take values up to, but not including, the
             // last non-empty frame (which may be partial)
 
-            int sz = m_lastNonEmptyFrame[i];
+            int sz = m_lastNonEmptyFrame[i] - m_emptyFrameCount[i];
             if (sz < 0) sz = 0;
+            if (sz >= m_values[i].size()) sz = m_values[i].size()-1;
 
             count = 0;
             for (int k = 0; k < sz; ++k) {
                 double val = m_values[i][k][j];
                 if (isnan(val) || isinf(val)) continue;

 SimilarityPlugin::FeatureMatrix
 SimilarityPlugin::calculateRhythmic(FeatureSet &returnFeatures)
 {
     if (!needRhythm()) return FeatureMatrix();
 
+//        std::cerr << "SimilarityPlugin::initialise: rhythm clip for channel 0 contains "
+//                  << m_rhythmValues[0].size() << " frames of size "
+//                  << m_rhythmClipFrameSize << " at process rate "
+//                  << m_processRate << " ( = "
+//                  << (float(m_rhythmValues[0].size() * m_rhythmClipFrameSize) / m_processRate) << " sec )"
+//                  << std::endl;
+
     BeatSpectrum bscalc;
     CosineDistance cd;
 
     // Our rhythm feature matrix is a deque of vectors for practical
     // reasons, but BeatSpectrum::process wants a vector of vectors