Changeset 8766cb6 for src

Timestamp:

Oct 7, 2009, 8:31:43 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:

a808d05

Parents:

cfa0f12

Message:

src/onset/peakpick.c: rename aubio_pickpeak_t to aubio_peakpicker_t

Location:

src

Files:

• onset/onset.c (modified) (1 diff)
• onset/peakpick.c (modified) (5 diffs)
• onset/peakpick.h (modified) (1 diff)
• tempo/tempo.c (modified) (1 diff)

src/onset/onset.c

@@ -31 +31 @@
   aubio_pvoc_t * pv;            /**< phase vocoder */
   aubio_onsetdetection_t * od;  /**< onset detection */ 
-  aubio_pickpeak_t * pp;        /**< peak picker */
+  aubio_peakpicker_t * pp;      /**< peak picker */
   cvec_t * fftgrain;            /**< phase vocoder output */
   fvec_t * of;                  /**< onset detection function */

src/onset/peakpick.c

@@ -30 +30 @@
  *      time->           ^now
  */
-struct _aubio_pickpeak_t {
+struct _aubio_peakpicker_t {
         /** thresh: offset threshold [0.033 or 0.01] */
         smpl_t threshold;       
@@ -68 +68 @@
  * is slightly more permissive than the offline one, and yelds to an increase
  * of false positives. best  */
-smpl_t aubio_peakpicker_do(aubio_pickpeak_t * p, fvec_t * onset) {
+smpl_t aubio_peakpicker_do(aubio_peakpicker_t * p, fvec_t * onset) {
         fvec_t * onset_keep = (fvec_t *)p->onset_keep;
         fvec_t * onset_proc = (fvec_t *)p->onset_proc;
@@ -121 +121 @@
  * after smoothing
  */
-smpl_t aubio_peakpicker_get_thresholded_input(aubio_pickpeak_t * p) 
+smpl_t aubio_peakpicker_get_thresholded_input(aubio_peakpicker_t * p) 
 {
         return p->onset_peek->data[0][1];
@@ -127 +127 @@
 
 /** function added by Miguel Ramirez to return the onset detection amplitude in peakval */
-void aubio_peakpicker_set_threshold(aubio_pickpeak_t * p, smpl_t threshold) {
+void aubio_peakpicker_set_threshold(aubio_peakpicker_t * p, smpl_t threshold) {
         p->threshold = threshold;
         return;
 }
 
-smpl_t aubio_peakpicker_get_threshold(aubio_pickpeak_t * p) {
+smpl_t aubio_peakpicker_get_threshold(aubio_peakpicker_t * p) {
         return p->threshold;
 }
 
-void aubio_peakpicker_set_thresholdfn(aubio_pickpeak_t * p, aubio_thresholdfn_t thresholdfn) {
+void aubio_peakpicker_set_thresholdfn(aubio_peakpicker_t * p, aubio_thresholdfn_t thresholdfn) {
         p->thresholdfn = thresholdfn;
         return;
 }
 
-aubio_thresholdfn_t aubio_peakpicker_get_thresholdfn(aubio_pickpeak_t * p) {
+aubio_thresholdfn_t aubio_peakpicker_get_thresholdfn(aubio_peakpicker_t * p) {
         return (aubio_thresholdfn_t) (p->thresholdfn);
 }
 
-aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold) {
-        aubio_pickpeak_t * t = AUBIO_NEW(aubio_pickpeak_t);
+aubio_peakpicker_t * new_aubio_peakpicker(smpl_t threshold) {
+        aubio_peakpicker_t * t = AUBIO_NEW(aubio_peakpicker_t);
         t->threshold = 0.1; /* 0.0668; 0.33; 0.082; 0.033; */
         if (threshold > 0. && threshold < 10.)
@@ -167 +167 @@
 }
 
-void del_aubio_peakpicker(aubio_pickpeak_t * p) {
+void del_aubio_peakpicker(aubio_peakpicker_t * p) {
         del_aubio_biquad(p->biquad);
         del_fvec(p->onset_keep);

src/onset/peakpick.h

@@ -36 +36 @@
 typedef uint_t (*aubio_pickerfn_t)(fvec_t *input, uint_t pos);
 /** peak-picker structure */
-typedef struct _aubio_pickpeak_t aubio_pickpeak_t;
+typedef struct _aubio_peakpicker_t aubio_peakpicker_t;
 
 /** peak-picker creation function */
-aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold);
+aubio_peakpicker_t * new_aubio_peakpicker(smpl_t threshold);
 /** real time peak picking function */
-smpl_t aubio_peakpicker_do(aubio_pickpeak_t * p, fvec_t * DF);
+smpl_t aubio_peakpicker_do(aubio_peakpicker_t * p, fvec_t * DF);
 /** get current peak value */
-smpl_t aubio_peakpicker_get_thresholded_input(aubio_pickpeak_t * p);
+smpl_t aubio_peakpicker_get_thresholded_input(aubio_peakpicker_t * p);
 /** destroy peak picker structure */
-void del_aubio_peakpicker(aubio_pickpeak_t * p);
+void del_aubio_peakpicker(aubio_peakpicker_t * p);
 
 /** set peak picking threshold */
-void aubio_peakpicker_set_threshold(aubio_pickpeak_t * p, smpl_t threshold);
+void aubio_peakpicker_set_threshold(aubio_peakpicker_t * p, smpl_t threshold);
 /** get peak picking threshold */
-smpl_t aubio_peakpicker_get_threshold(aubio_pickpeak_t * p);
+smpl_t aubio_peakpicker_get_threshold(aubio_peakpicker_t * p);
 /** set peak picker thresholding function */
-void aubio_peakpicker_set_thresholdfn(aubio_pickpeak_t * p, aubio_thresholdfn_t thresholdfn);
+void 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_pickpeak_t * p);
+aubio_thresholdfn_t aubio_peakpicker_get_thresholdfn(aubio_peakpicker_t * p);
 
 #ifdef __cplusplus

src/tempo/tempo.c

@@ -32 +32 @@
   aubio_onsetdetection_t * od;   /** onset detection */
   aubio_pvoc_t * pv;             /** phase vocoder */
-  aubio_pickpeak_t * pp;         /** peak picker */
+  aubio_peakpicker_t * pp;       /** peak picker */
   aubio_beattracking_t * bt;     /** beat tracking */
   cvec_t * fftgrain;             /** spectral frame */