Changeset 650e39b for src

Timestamp:

Mar 21, 2006, 11:59:17 PM (18 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:

4798fdf

Parents:

4994ebb

Message:

add yinfft method, make it default for pd plugin
add yinfft method, make it default for pd plugin

Location:

src

Files:

• Makefile.am (modified) (2 diffs)
• pitchdetection.c (modified) (6 diffs)
• pitchdetection.h (modified) (2 diffs)
• pitchyinfft.c (added)
• pitchyinfft.h (added)

src/Makefile.am

@@ -18 +18 @@
         pitchschmitt.h \
         pitchfcomb.h \
+        pitchyinfft.h \
         beattracking.h \
         filter.h
@@ -57 +58 @@
         pitchfcomb.c \
         pitchfcomb.h \
+        pitchyinfft.c \
+        pitchyinfft.h \
         beattracking.c \
         beattracking.h \

src/pitchdetection.c

@@ -26 +26 @@
 #include "pitchfcomb.h"
 #include "pitchschmitt.h"
+#include "pitchyinfft.h"
 #include "pitchdetection.h"
 
@@ -44 +45 @@
         aubio_pitchfcomb_t * fcomb;
         aubio_pitchschmitt_t * schmitt;
+        aubio_pitchyinfft_t * yinfft;
         aubio_filter_t * filter;
         /* for yin */
@@ -92 +94 @@
                         p->pv       = new_aubio_pvoc(bufsize, hopsize, channels);
                         p->fftgrain = new_cvec(bufsize, channels);
-                        p->mcomb    = new_aubio_pitchmcomb(bufsize,channels,samplerate);
+                        p->mcomb    = new_aubio_pitchmcomb(bufsize,hopsize,channels,samplerate);
                         p->filter   = new_aubio_cdsgn_filter(samplerate);
                         p->callback = aubio_pitchdetection_mcomb;
@@ -105 +107 @@
                         p->schmitt  = new_aubio_pitchschmitt(bufsize,samplerate);
                         p->callback = aubio_pitchdetection_schmitt;
+                        break;
+                case aubio_pitch_yinfft:
+                        p->buf      = new_fvec(bufsize,channels);
+                        p->yinfft   = new_aubio_pitchyinfft(bufsize);
+                        p->callback = aubio_pitchdetection_yinfft;
+                        p->yinthres = 0.2;
                         break;
                 default:
@@ -147 +155 @@
                         del_fvec(p->buf);
                         del_aubio_pitchfcomb(p->fcomb);
+                        break;
+                case aubio_pitch_yinfft:
+                        del_fvec(p->buf);
+                        del_aubio_pitchyinfft(p->yinfft);
                         break;
                 default:
@@ -206 +218 @@
 
 
+smpl_t aubio_pitchdetection_yinfft(aubio_pitchdetection_t *p, fvec_t *ibuf){
+        smpl_t pitch = 0.;
+        aubio_pitchdetection_slideblock(p,ibuf);
+        pitch = aubio_pitchyinfft_detect(p->yinfft,p->buf,p->yinthres);
+        if (pitch>0) {
+                pitch = p->srate/(pitch+0.);
+        } else {
+                pitch = 0.;
+        }
+        return pitch; 
+}
+
 smpl_t aubio_pitchdetection_fcomb(aubio_pitchdetection_t *p, fvec_t *ibuf){
         aubio_pitchdetection_slideblock(p,ibuf);

src/pitchdetection.h

@@ -28 +28 @@
         aubio_pitch_mcomb,
         aubio_pitch_schmitt,
-        aubio_pitch_fcomb
+        aubio_pitch_fcomb,
+        aubio_pitch_yinfft
 } aubio_pitchdetection_type;
 
@@ -45 +46 @@
 smpl_t aubio_pitchdetection_schmitt(aubio_pitchdetection_t *p, fvec_t *ibuf);
 smpl_t aubio_pitchdetection_fcomb(aubio_pitchdetection_t *p, fvec_t *ibuf);
+smpl_t aubio_pitchdetection_yinfft(aubio_pitchdetection_t *p, fvec_t *ibuf);
 
 void aubio_pitchdetection_set_yinthresh(aubio_pitchdetection_t *p, smpl_t thres);