Changeset b01bd4a for src/onset

Timestamp:

Oct 19, 2009, 2:45:13 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:

b849106

Parents:

59c046d

Message:

src/temporal: derive biquad from filter, use in peakpicker

File:

• src/onset/peakpick.c (modified) (4 diffs)

src/onset/peakpick.c

@@ -21 +21 @@
 #include "fvec.h"
 #include "mathutils.h"
+#include "lvec.h"
+#include "temporal/filter.h"
 #include "temporal/biquad.h"
 #include "onset/peakpick.h"
@@ -43 +45 @@
 
         /** biquad lowpass filter */
-        aubio_biquad_t * biquad;
+        aubio_filter_t * biquad;
         /** original onsets */
         fvec_t * onset_keep;
@@ -95 +97 @@
   /* filter onset_proc */
   /** \bug filtfilt calculated post+pre times, should be only once !? */
-  //aubio_biquad_do_filtfilt(p->biquad,onset_proc,scratch);
+  aubio_filter_do_filtfilt (p->biquad, onset_proc, scratch);
 
   for (i = 0; i < p->channels; i++) {
@@ -160 +162 @@
         t->onset_peek = new_fvec(3, channels);
 
-        /* cutoff: low-pass filter cutoff [0.34, 1] */
-        /* t->cutoff=0.34; */
-        t->biquad = new_aubio_biquad(0.1600,0.3200,0.1600,-0.5949,0.2348);
+        /* cutoff: low-pass filter with cutoff reduced frequency at 0.34
+   generated with octave butter function: [b,a] = butter(2, 0.34);
+   */
+  t->biquad = new_aubio_filter_biquad (0.15998789, 0.31997577, 0.15998789,
+    -0.59488894, 0.23484048, channels);
+
         return t;
 }
 
 void del_aubio_peakpicker(aubio_peakpicker_t * p) {
-        del_aubio_biquad(p->biquad);
+        del_aubio_filter(p->biquad);
         del_fvec(p->onset_keep);
         del_fvec(p->onset_proc);