comparison dsp/tempotracking/DownBeat.cpp @ 281:33e03341d541

* Make it possible to retrieve beat spectral difference function from
  bar detector
* Avoid crashes when bar detector is run with very short input

     //  DAVIES AND PLUMBLEY "A SPECTRAL DIFFERENCE APPROACH TO EXTRACTING DOWNBEATS IN MUSICAL AUDIO"
     //  EUSIPCO 2006, FLORENCE, ITALY
 
     d_vec_t newspec(m_beatframesize / 2); // magnitude spectrum of current beat
     d_vec_t oldspec(m_beatframesize / 2); // magnitude spectrum of previous beat
-    d_vec_t specdiff;
+
+    m_beatsd.clear();
 
     if (audioLength == 0) return;
 
     for (size_t i = 0; i + 1 < beats.size(); ++i) {
 

 
         MathUtilities::adaptiveThreshold(newspec);
 
         // Calculate JS divergence between new and old spectral frames
 
-        specdiff.push_back(measureSpecDiff(oldspec, newspec));
-//        specdiff.push_back(KLDivergence().distanceDistribution(oldspec, newspec, false));
-
-        std::cerr << "specdiff: " << specdiff[specdiff.size()-1] << std::endl;
+        if (i > 0) { // otherwise we have no previous frame
+            m_beatsd.push_back(measureSpecDiff(oldspec, newspec));
+            std::cerr << "specdiff: " << m_beatsd[m_beatsd.size()-1] << std::endl;
+        }
 
         // Copy newspec across to old
 
         for (size_t j = 0; j < m_beatframesize/2; ++j) {
             oldspec[j] = newspec[j];

         dbcand[beat] = 0;
     }
 
     // look for beat transition which leads to greatest spectral change
     for (int beat = 0; beat < timesig; ++beat) {
-        for (int example = beat; example < specdiff.size(); example += timesig) {
-            dbcand[beat] += (specdiff[example]) / timesig;
-        }
+        int count = 0;
+        for (int example = beat - 1; example < m_beatsd.size(); example += timesig) {
+            if (example < 0) continue;
+            dbcand[beat] += (m_beatsd[example]) / timesig;
+            ++count;
+        }
+        if (count > 0) m_beatsd[beat] /= count;
         std::cerr << "dbcand[" << beat << "] = " << dbcand[beat] << std::endl;
     }
 
 
     // first downbeat is beat at index of maximum value of dbcand

     }
     
     return SD;
 }
 
+void
+DownBeat::getBeatSD(vector<double> &beatsd) const
+{
+    for (int i = 0; i < m_beatsd.size(); ++i) beatsd.push_back(m_beatsd[i]);
+}
+