Changes in src/tempo/beattracking.c [2823389:72db1cf]

File:

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

src/tempo/beattracking.c

@@ -171 +171 @@
   /* find non-zero Rayleigh period */
   maxindex = fvec_max_elem (bt->acfout);
-  bt->rp = maxindex ? fvec_quadratic_peak_pos (bt->acfout, maxindex) : 1;
+  bt->rp = maxindex ? fvec_quadint (bt->acfout, maxindex) : 1;
   //rp = (maxindex==127) ? 43 : maxindex; //rayparam
   bt->rp = (maxindex == bt->acfout->length - 1) ? bt->rayparam : maxindex;      //rayparam
@@ -183 +183 @@
   /* end of biased filterbank */
 
-  if (bp == 0) {
-    output->data[0] = 0;
-    return;
-  }
 
   /* deliberate integer operation, could be set to 3 max eventually */
@@ -208 +204 @@
     phase = step - bt->lastbeat;
   } else {
-    phase = fvec_quadratic_peak_pos (bt->phout, maxindex);
+    phase = fvec_quadint (bt->phout, maxindex);
   }
   /* take back one frame delay */
@@ -310 +306 @@
     }
     fvec_weight (acfout, bt->gwv);
-    gp = fvec_quadratic_peak_pos (acfout, fvec_max_elem (acfout));
+    gp = fvec_quadint (acfout, fvec_max_elem (acfout));
     /*
        while(gp<32) gp =gp*2;
@@ -386 +382 @@
 
   /* if tempo is > 206 bpm, half it */
-  while (0 < bp && bp < 25) {
+  while (bp < 25) {
 #if AUBIO_BEAT_WARNINGS
     AUBIO_WRN ("doubling from %f (%f bpm) to %f (%f bpm)\n",
@@ -413 +409 @@
 aubio_beattracking_get_bpm (aubio_beattracking_t * bt)
 {
-  if (bt->bp != 0 && bt->timesig != 0 && bt->counter == 0 && bt->flagstep == 0) {
-    return 5168. / fvec_quadratic_peak_pos (bt->acfout, bt->bp);
+  if (bt->timesig != 0 && bt->counter == 0 && bt->flagstep == 0) {
+    return 5168. / fvec_quadint (bt->acfout, bt->bp);
   } else {
     return 0.;