Changeset 17b7d66

Timestamp:

Sep 28, 2009, 8:12:02 PM (15 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

258195f

Parents:

3de10bb

Message:

src/tempo/beattracking.c: avoid large backward off-beat errors, add define for debugging

File:

• src/tempo/beattracking.c (modified) (5 diffs)

src/tempo/beattracking.c

@@ -22 +22 @@
 #include "mathutils.h"
 #include "tempo/beattracking.h"
+
+/** define to 1 to print out tracking difficulties */
+#define AUBIO_BEAT_WARNINGS 1
 
 uint_t fvec_gettimesig (fvec_t * acf, uint_t acflen, uint_t gp);
@@ -195 +198 @@
   maxindex = vec_max_elem (bt->phout);
   if (maxindex >= winlen - 1) {
-    // AUBIO_WRN ("damned, no idea what this groove is\n");
+#if AUBIO_BEAT_WARNINGS
+    AUBIO_WRN ("no idea what this groove's phase is\n");
+#endif /* AUBIO_BEAT_WARNINGS */
     phase = step - bt->lastbeat;
   } else {
     phase = vec_quadint (bt->phout, maxindex, 1);
   }
+  /* take back one frame delay */
+  phase += 1.;
 #if 0                           // debug metronome mode
   phase = step - bt->lastbeat;
@@ -209 +216 @@
   i = 1;
   beat = bp - phase;
-  //AUBIO_DBG ("beat: %f, bp: %f, phase: %f, lastbeat: %f, step: %d, winlen: %d\n", 
-  //    beat, bp, phase, bt->lastbeat, step, winlen);
+
+  // AUBIO_DBG ("bp: %f, phase: %f, lastbeat: %f, step: %d, winlen: %d\n", 
+  //    bp, phase, bt->lastbeat, step, winlen);
+
+  /* the next beat will be earlier than 60% of the tempo period
+    skip this one */
+  if ( ( step - bt->lastbeat - phase ) < -0.40 * bp ) {
+#if AUBIO_BEAT_WARNINGS
+    AUBIO_WRN ("back off-beat error, skipping this beat\n");
+#endif /* AUBIO_BEAT_WARNINGS */
+    beat += bp;
+  }
+
   /* start counting the beats */
   while (beat + bp < 0) {
@@ -230 +248 @@
 
   bt->lastbeat = beat;
-  /* store the number of beat found in this frame as the first element */
+  /* store the number of beats in this frame as the first element */
   output->data[0][0] = i;
 }
@@ -364 +382 @@
   /* if tempo is > 206 bpm, half it */
   while (bp < 25) {
-    //AUBIO_DBG("warning, doubling the beat period from %d\n", bp);
+#if AUBIO_BEAT_WARNINGS
+    AUBIO_WRN ("doubling from %f (%f bpm) to %f (%f bpm)\n",
+        bp, 60.*44100./512./bp, bp/2., 60.*44100./512./bp/2. );
     //AUBIO_DBG("warning, halving the tempo from %f\n", 60.*samplerate/hopsize/bp);
+#endif /* AUBIO_BEAT_WARNINGS */
     bp = bp * 2;
   }