Changeset acd97d1 for src/tempo

Timestamp:

Oct 15, 2013, 10:57:38 PM (11 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:

735a739

Parents:

69c39ca

Message:

src/mathutils.{c,h}: remove fvec_quadint, use fvec_quadratic_peak_pos

File:

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

src/tempo/beattracking.c

@@ -171 +171 @@
   /* find non-zero Rayleigh period */
   maxindex = fvec_max_elem (bt->acfout);
-  bt->rp = maxindex ? fvec_quadint (bt->acfout, maxindex) : 1;
+  bt->rp = maxindex ? fvec_quadratic_peak_pos (bt->acfout, maxindex) : 1;
   //rp = (maxindex==127) ? 43 : maxindex; //rayparam
   bt->rp = (maxindex == bt->acfout->length - 1) ? bt->rayparam : maxindex;      //rayparam
@@ -204 +204 @@
     phase = step - bt->lastbeat;
   } else {
-    phase = fvec_quadint (bt->phout, maxindex);
+    phase = fvec_quadratic_peak_pos (bt->phout, maxindex);
   }
   /* take back one frame delay */
@@ -306 +306 @@
     }
     fvec_weight (acfout, bt->gwv);
-    gp = fvec_quadint (acfout, fvec_max_elem (acfout));
+    gp = fvec_quadratic_peak_pos (acfout, fvec_max_elem (acfout));
     /*
        while(gp<32) gp =gp*2;
@@ -409 +409 @@
 aubio_beattracking_get_bpm (aubio_beattracking_t * bt)
 {
-  if (bt->timesig != 0 && bt->counter == 0 && bt->flagstep == 0) {
-    return 5168. / fvec_quadint (bt->acfout, bt->bp);
+  if (bt->bp != 0 && bt->timesig != 0 && bt->counter == 0 && bt->flagstep == 0) {
+    return 5168. / fvec_quadratic_peak_pos (bt->acfout, bt->bp);
   } else {
     return 0.;