Changeset acd97d1

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

Location:

src

Files:

• mathutils.c (modified) (1 diff)
• mathutils.h (modified) (1 diff)
• onset/peakpicker.c (modified) (1 diff)
• tempo/beattracking.c (modified) (4 diffs)

src/mathutils.c

@@ -368 +368 @@
 }
 
-smpl_t fvec_quadint (fvec_t * x, uint_t pos) {
-  smpl_t s0, s1, s2;
-  uint_t x0 = (pos < 1) ? pos : pos - 1;
-  uint_t x2 = (pos + 1 < x->length) ? pos + 1 : pos;
-  if (x0 == pos) return (x->data[pos] <= x->data[x2]) ? pos : x2;
-  if (x2 == pos) return (x->data[pos] <= x->data[x0]) ? pos : x0;
-  s0 = x->data[x0];
-  s1 = x->data[pos];
-  s2 = x->data[x2];
-  return pos + 0.5 * (s2 - s0 ) / (s2 - 2.* s1 + s0);
-}
-
 smpl_t fvec_quadratic_peak_pos (fvec_t * x, uint_t pos) {
   smpl_t s0, s1, s2;
+  if (pos == 0 || pos == x->length - 1) return pos;
   uint_t x0 = (pos < 1) ? pos : pos - 1;
   uint_t x2 = (pos + 1 < x->length) ? pos + 1 : pos;

src/mathutils.h

@@ -232 +232 @@
 smpl_t fvec_median (fvec_t * v);
 
-/** finds exact peak index by quadratic interpolation*/
-smpl_t fvec_quadint (fvec_t * x, uint_t pos);
-
 /** finds exact peak index by quadratic interpolation
 

src/onset/peakpicker.c

@@ -125 +125 @@
   out->data[0] = (p->pickerfn) (onset_peek, 1);
   if (out->data[0]) {
-    out->data[0] = fvec_quadint (onset_peek, 1);
+    out->data[0] = fvec_quadratic_peak_pos (onset_peek, 1);
   }
 }

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.;