Changeset 3de10bb

Timestamp:

Sep 27, 2009, 2:19:49 AM (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:

17b7d66

Parents:

e792ea8

Message:

src/tempo/beattracking.c: fix maxindex == winlen never reached condition, avoiding very large bpm values, add some debugging strings

File:

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

src/tempo/beattracking.c

@@ -194 +194 @@
   /* find Rayleigh period */
   maxindex = vec_max_elem (bt->phout);
-  if (maxindex == winlen)
-    maxindex = 0;
-  phase = 1. + vec_quadint (bt->phout, maxindex, 1);
+  if (maxindex >= winlen - 1) {
+    // AUBIO_WRN ("damned, no idea what this groove is\n");
+    phase = step - bt->lastbeat;
+  } else {
+    phase = vec_quadint (bt->phout, maxindex, 1);
+  }
 #if 0                           // debug metronome mode
   phase = step - bt->lastbeat;
@@ -206 +209 @@
   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);
   /* start counting the beats */
+  while (beat + bp < 0) {
+    beat += bp;
+  }
+
   if (beat >= 0) {
+    //AUBIO_DBG ("beat: %d, %f, %f\n", i, bp, beat);
     output->data[0][i] = beat;
     i++;
@@ -214 +224 @@
   while (beat + bp <= step) {
     beat += bp;
+    //AUBIO_DBG ("beat: %d, %f, %f\n", i, bp, beat);
     output->data[0][i] = beat;
     i++;