Changeset 6efdc83

Timestamp:

Sep 27, 2005, 9:10:49 PM (19 years ago)

Author:

Paul Brossier <piem@altern.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:

26d9f8f

Parents:

bfe76d4

Message:

added {set,get}_threshold{,fn} to peakpick
added {set,get}_threshold{,fn} to peakpick

Location:

src

Files:

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

src/peakpick.c

@@ -38 +38 @@
         uint_t  win_pre;                                
         /**     threshfn: name or handle of fn for computing adaptive threshold [@median]  */
-        //aubio_thresholdfn_t thresholdfn;
+        aubio_thresholdfn_t thresholdfn;
         /**     picker:   name or handle of fn for picking event times [@peakpick] */
         aubio_pickerfn_t pickerfn;
@@ -48 +48 @@
         /** modified onsets */
         fvec_t * onset_proc;
-        /* peak picked window [3] */
+        /** peak picked window [3] */
         fvec_t * onset_peek;
         /** scratch pad for biquad and median */
@@ -98 +98 @@
         for (j = 0; j < length; j++)
                 scratch->data[i][j] = onset_proc->data[i][j];
-        median = vec_median(scratch);
+        median = p->thresholdfn(scratch);
         /* } */
 
@@ -165 +165 @@
 }
 
-
+void aubio_peakpicker_set_threshold(aubio_pickpeak_t * p, smpl_t threshold) {
+        p->threshold = threshold;
+        return;
+}
+
+smpl_t aubio_peakpicker_get_threshold(aubio_pickpeak_t * p) {
+        return p->threshold;
+}
+
+void aubio_peakpicker_set_thresholdfn(aubio_pickpeak_t * p, aubio_thresholdfn_t thresholdfn) {
+        p->thresholdfn = thresholdfn;
+        return;
+}
+
+aubio_thresholdfn_t aubio_peakpicker_get_thresholdfn(aubio_pickpeak_t * p) {
+        return (aubio_thresholdfn_t) (p->thresholdfn);
+}
 
 aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold) {
@@ -175 +191 @@
         t->win_pre   = 1;
 
-        //t->thresholdfn = (aubio_thresholdfn_t)(vec_median); /* (vec_mean); */
+        t->thresholdfn = (aubio_thresholdfn_t)(vec_median); /* (vec_mean); */
         t->pickerfn = (aubio_pickerfn_t)(vec_peakpick);
 

src/peakpick.h

@@ -41 +41 @@
 void del_aubio_peakpicker(aubio_pickpeak_t * p);
 
+void aubio_peakpicker_set_threshold(aubio_pickpeak_t * p, smpl_t threshold);
+smpl_t aubio_peakpicker_get_threshold(aubio_pickpeak_t * p);
+void aubio_peakpicker_set_thresholdfn(aubio_pickpeak_t * p, aubio_thresholdfn_t thresholdfn);
+aubio_thresholdfn_t aubio_peakpicker_get_thresholdfn(aubio_pickpeak_t * p);
+
 #ifdef __cplusplus
 }