Changeset 0f6f2e6

Timestamp:

Oct 5, 2009, 7:40:45 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:

998a8be

Parents:

eebb0e1

Message:

src/onset/peakpick.c: use quadint in peakpick to get interpolated peak position, real in the range [0,2] in number of hop size

Location:

src/onset

Files:

• onset.c (modified) (1 diff)
• peakpick.c (modified) (3 diffs)
• peakpick.h (modified) (1 diff)

src/onset/onset.c

@@ -52 +52 @@
   }*/
   isonset = aubio_peakpick_pimrt(o->of,o->pp);
-  if (isonset) {
+  if (isonset > 0.) {
     if (aubio_silence_detection(input, o->silence)==1) {
       isonset  = 0;

src/onset/peakpick.c

@@ -68 +68 @@
  * is slightly more permissive than the offline one, and yelds to an increase
  * of false positives. best  */
-uint_t aubio_peakpick_pimrt(fvec_t * onset,  aubio_pickpeak_t * p) {
+smpl_t aubio_peakpick_pimrt(fvec_t * onset,  aubio_pickpeak_t * p) {
         fvec_t * onset_keep = (fvec_t *)p->onset_keep;
         fvec_t * onset_proc = (fvec_t *)p->onset_proc;
@@ -74 +74 @@
         fvec_t * scratch    = (fvec_t *)p->scratch;
         smpl_t mean = 0., median = 0.;
+  smpl_t isonset = 0.;
         uint_t length = p->win_post + p->win_pre + 1;
         uint_t i = 0, j;
@@ -110 +111 @@
         /* } */
         //AUBIO_DBG("%f\n", onset_peek->data[0][2]);
-        return (p->pickerfn)(onset_peek,1);
+  isonset = (p->pickerfn)(onset_peek,1);
+  if (isonset) { //(isonset) {
+    isonset = fvec_quadint(onset_peek, 1, 1);
+  }
+        return isonset;
 }
 

src/onset/peakpick.h

@@ -41 +41 @@
 aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold);
 /** real time peak picking function */
-uint_t aubio_peakpick_pimrt(fvec_t * DF, aubio_pickpeak_t * p);
+smpl_t aubio_peakpick_pimrt(fvec_t * DF, aubio_pickpeak_t * p);
 /** function added by Miguel Ramirez to return the onset detection amplitude in peakval */
 uint_t aubio_peakpick_pimrt_wt( fvec_t* DF, aubio_pickpeak_t* p, smpl_t* peakval );