comparison examples/FixedTempoEstimator.cpp @ 208:df55003e8968

* Slightly different angle on filtering... hmmm

         cerr << "i = " << i << ": tempo = " << lag2tempo(i) << ", weight = " << weight << endl;
 
         m_fr[i] = m_r[i] * (1 + weight / 3.f);
     }
 
-    float related[4] = { 2, 3, 4 };
+    int related[4] = { 2, 3, 4 };
+
+    int e = tempo2lag(60.f);
+    int universalDiv = (n/2 - 1) / e;
+    cerr << "universalDiv = " << universalDiv << endl;
 
     for (int i = 0; i < n/2; ++i) {
 
-        if (i == 0 || i == n/2 - 1 ||
+        if (i == 0 || i == n/2 - 1
+/*
+            ||
             !(m_fr[i] > m_fr[i-1] &&
-              m_fr[i] >= m_fr[i+1])) {
+              m_fr[i] >= m_fr[i+1])
+*/
+            ) {
             continue;
         }
 
         int div = 1;
 

 
                     if (k == k0 - 2 || m_r[k] < kvmin) {
                         kmin = k;
                         kvmin = m_r[k];
                     }
+                }
+
+                if (related[j] <= universalDiv) {
+//                    m_fr[i] += m_fr[kmax]; //!!!
+                    m_fr[i] += m_r[kmax] / related[j];
                 }
 
                 if (m_r[kmax] > m_r[kmax-1] &&
                     m_r[kmax] > m_r[kmax+1] &&
                     kvmax > kvmin * 1.05) {

 //            cerr << "adjusting tempo from " << lag2tempo(i) << " to "
 //                      << m_t[i] << endl;
 //        }
     }
 
+/*
     int e = tempo2lag(60.f);
     int div = (n/2 - 1) / e;
 
 //    cerr << "e = " << e << ", n/2 = " << n/2 << ", div = " << div << endl;
     if (div > 1) {

             for (int i = 1; i <= e; ++i) {
                 m_fr[i] += m_fr[i * j] * (1.f / j);
             }
         }
     }
-
+*/
 //        cerr << "i = " << i << ", (n/2 - 1)/i = " << (n/2 - 1)/i << ", sum = " << m_fr[i] << ", div = " << div << ", val = " << m_fr[i] / div << ", t = " << lag2tempo(i) << endl;
 
 
 //    }
 

     char buffer[40];
 
     int n = m_n;
 
     for (int i = 0; i < n; ++i) {
-        feature.timestamp = RealTime::frame2RealTime(i * m_stepSize,
-                                                     m_inputSampleRate);
+        feature.timestamp = m_start +
+            RealTime::frame2RealTime(i * m_stepSize, m_inputSampleRate);
         feature.values[0] = m_df[i];
         feature.label = "";
         fs[DFOutput].push_back(feature);
     }
 
     for (int i = 1; i < n/2; ++i) {
-        feature.timestamp = RealTime::frame2RealTime(i * m_stepSize,
-                                                     m_inputSampleRate);
+        feature.timestamp = m_start +
+            RealTime::frame2RealTime(i * m_stepSize, m_inputSampleRate);
         feature.values[0] = m_r[i];
         sprintf(buffer, "%.1f bpm", lag2tempo(i));
         if (i == n/2-1) feature.label = "";
         else feature.label = buffer;
         fs[ACFOutput].push_back(feature);

 
     for (int i = p0; i <= p1 && i < n/2-1; ++i) {
 
         candidates[m_fr[i]] = i;
 
-        feature.timestamp = RealTime::frame2RealTime(i * m_stepSize,
-                                                     m_inputSampleRate);
+        feature.timestamp = m_start +
+            RealTime::frame2RealTime(i * m_stepSize, m_inputSampleRate);
         feature.values[0] = m_fr[i];
         sprintf(buffer, "%.1f bpm", lag2tempo(i));
         if (i == p1 || i == n/2-2) feature.label = "";
         else feature.label = buffer;
         fs[FilteredACFOutput].push_back(feature);