Changeset 6e57c2e

Timestamp:

Nov 5, 2009, 11:17:56 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:

e5b9a46

Parents:

48b6a52

Message:

src/onset/peakpick.h: remove unused functions, fix aubio_peakpicker_get_thresholded_input

Location:

src/onset

Files:

• peakpick.c (modified) (7 diffs)
• peakpick.h (modified) (2 diffs)

src/onset/peakpick.c

@@ -26 +26 @@
 #include "temporal/biquad.h"
 #include "onset/peakpick.h"
+
+/** function pointer to thresholding function */
+typedef smpl_t (*aubio_thresholdfn_t)(fvec_t *input, uint_t channel);
+/** function pointer to peak-picking function */
+typedef uint_t (*aubio_pickerfn_t)(fvec_t *input, uint_t pos);
+
+/** set peak picker thresholding function */
+uint_t aubio_peakpicker_set_thresholdfn(aubio_peakpicker_t * p, aubio_thresholdfn_t thresholdfn);
+/** get peak picker thresholding function */
+aubio_thresholdfn_t aubio_peakpicker_get_thresholdfn(aubio_peakpicker_t * p);
 
 /* peak picking parameters, default values in brackets
@@ -54 +64 @@
         /** peak picked window [3] */
   fvec_t *onset_peek;
+        /** thresholded function */
+  fvec_t *thresholded;
         /** scratch pad for biquad and median */
   fvec_t *scratch;
@@ -81 +93 @@
   fvec_t *onset_proc = p->onset_proc;
   fvec_t *onset_peek = p->onset_peek;
+  fvec_t *thresholded = p->thresholded;
   fvec_t *scratch = p->scratch;
   smpl_t mean = 0., median = 0.;
@@ -112 +125 @@
     for (j = 0; j < 3 - 1; j++)
       onset_peek->data[i][j] = onset_peek->data[i][j + 1];
-    /* calculate new peek value */
-    onset_peek->data[i][2] =
+    /* calculate new tresholded value */
+    thresholded->data[i][0] =
         onset_proc->data[i][p->win_post] - median - mean * p->threshold;
+    onset_peek->data[i][2] = thresholded->data[i][0];
     out->data[i][0] = (p->pickerfn) (onset_peek, 1);
     if (out->data[i][0]) {
@@ -125 +139 @@
  * after smoothing
  */
-smpl_t
+fvec_t *
 aubio_peakpicker_get_thresholded_input (aubio_peakpicker_t * p)
 {
-  return p->onset_peek->data[0][1];
+  return p->thresholded;
 }
 
@@ -175 +189 @@
   t->onset_proc = new_fvec (t->win_post + t->win_pre + 1, channels);
   t->onset_peek = new_fvec (3, channels);
+  t->thresholded = new_fvec (1, channels);
 
   /* cutoff: low-pass filter with cutoff reduced frequency at 0.34
@@ -192 +207 @@
   del_fvec (p->onset_proc);
   del_fvec (p->onset_peek);
+  del_fvec (p->thresholded);
   del_fvec (p->scratch);
   AUBIO_FREE (p);

src/onset/peakpick.h

@@ -32 +32 @@
 #endif
 
-/** function pointer to thresholding function */
-typedef smpl_t (*aubio_thresholdfn_t)(fvec_t *input, uint_t channel);
-/** function pointer to peak-picking function */
-typedef uint_t (*aubio_pickerfn_t)(fvec_t *input, uint_t pos);
 /** peak-picker structure */
 typedef struct _aubio_peakpicker_t aubio_peakpicker_t;
@@ -43 +39 @@
 /** real time peak picking function */
 void aubio_peakpicker_do(aubio_peakpicker_t * p, fvec_t * in, fvec_t * out);
-/** get current peak value */
-smpl_t aubio_peakpicker_get_thresholded_input(aubio_peakpicker_t * p);
 /** destroy peak picker structure */
 void del_aubio_peakpicker(aubio_peakpicker_t * p);
 
+/** get current peak value */
+fvec_t *aubio_peakpicker_get_thresholded_input (aubio_peakpicker_t * p);
 /** set peak picking threshold */
 uint_t aubio_peakpicker_set_threshold(aubio_peakpicker_t * p, smpl_t threshold);
 /** get peak picking threshold */
 smpl_t aubio_peakpicker_get_threshold(aubio_peakpicker_t * p);
-/** set peak picker thresholding function */
-uint_t aubio_peakpicker_set_thresholdfn(aubio_peakpicker_t * p, aubio_thresholdfn_t thresholdfn);
-/** get peak picker thresholding function */
-aubio_thresholdfn_t aubio_peakpicker_get_thresholdfn(aubio_peakpicker_t * p);
 
 #ifdef __cplusplus