Changeset f8a38c5

Timestamp:

Mar 16, 2006, 4:42:11 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:

845f2d4

Parents:

fbd3de6

Message:

samplerate support, add filter for mcomb, yinthresh
samplerate support, add filter for mcomb, yinthresh

Location:

src

Files:

• pitchdetection.c (modified) (7 diffs)
• pitchdetection.h (modified) (1 diff)

src/pitchdetection.c

@@ -21 +21 @@
 #include "phasevoc.h"
 #include "mathutils.h"
-//#include "filter.h"
+#include "filter.h"
 #include "pitchmcomb.h"
 #include "pitchyin.h"
@@ -44 +44 @@
         aubio_pitchfcomb_t * fcomb;
         aubio_pitchschmitt_t * schmitt;
-        //aubio_filter_t * filter;
+        aubio_filter_t * filter;
         /* for yin */
         fvec_t * buf;
@@ -50 +50 @@
         aubio_pitchdetection_func_t callback;
         aubio_pitchdetection_conv_t freqconv;
+        smpl_t yinthres;
 };
 
@@ -86 +87 @@
                         p->yin      = new_fvec(bufsize/2,channels);
                         p->callback = aubio_pitchdetection_yin;
+                        p->yinthres = 0.2;
                         break;
                 case aubio_pitch_mcomb:
                         p->pv       = new_aubio_pvoc(bufsize, hopsize, channels);
                         p->fftgrain = new_cvec(bufsize, channels);
-                        p->mcomb    = new_aubio_pitchmcomb(bufsize,channels);
+                        p->mcomb    = new_aubio_pitchmcomb(bufsize,channels,samplerate);
+                        p->filter   = new_aubio_cdsgn_filter(samplerate);
                         p->callback = aubio_pitchdetection_mcomb;
                         break;
                 case aubio_pitch_fcomb:
                         p->buf      = new_fvec(bufsize,channels);
-                        p->fcomb    = new_aubio_pitchfcomb(bufsize,samplerate);
+                        p->fcomb    = new_aubio_pitchfcomb(bufsize,hopsize,samplerate);
                         p->callback = aubio_pitchdetection_fcomb;
                         break;
@@ -168 +171 @@
 }
 
+void aubio_pitchdetection_set_yinthresh(aubio_pitchdetection_t *p, smpl_t thres) {
+        p->yinthres = thres;
+}
+
 smpl_t aubio_pitchdetection(aubio_pitchdetection_t *p, fvec_t * ibuf) {
         return p->freqconv(p->callback(p,ibuf),p->srate,p->bufsize);
@@ -174 +181 @@
 smpl_t aubio_pitchdetection_mcomb(aubio_pitchdetection_t *p, fvec_t *ibuf) {
         smpl_t pitch = 0.;
+        aubio_filter_do(p->filter,ibuf);
         aubio_pvoc_do(p->pv,ibuf,p->fftgrain);
         pitch = aubio_pitchmcomb_detect(p->mcomb,p->fftgrain);
@@ -188 +196 @@
         smpl_t pitch = 0.;
         aubio_pitchdetection_slideblock(p,ibuf);
-        pitch = aubio_pitchyin_getpitchfast(p->buf,p->yin, 0.5);
+        pitch = aubio_pitchyin_getpitchfast(p->buf,p->yin, p->yinthres);
         if (pitch>0) {
                 pitch = p->srate/(pitch+0.);

src/pitchdetection.h

@@ -46 +46 @@
 smpl_t aubio_pitchdetection_fcomb(aubio_pitchdetection_t *p, fvec_t *ibuf);
 
+void aubio_pitchdetection_set_yinthresh(aubio_pitchdetection_t *p, smpl_t thres);
 void del_aubio_pitchdetection(aubio_pitchdetection_t * p);