Changeset 650e39b

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

Files:

• plugins/puredata/aubiopitch~.c (modified) (2 diffs)
• python/aubio/task/pitch.py (modified) (5 diffs)
• python/aubio/task/utils.py (modified) (1 diff)
• python/aubiopitch (modified) (2 diffs)
• src/Makefile.am (modified) (2 diffs)
• src/pitchdetection.c (modified) (6 diffs)
• src/pitchdetection.h (modified) (2 diffs)
• src/pitchyinfft.c (added)
• src/pitchyinfft.h (added)
• swig/aubio.i (modified) (3 diffs)

plugins/puredata/aubiopitch~.c

@@ -13 +13 @@
 char aubiopitch_version[] = "aubiopitch~ version 0.1";
 
-aubio_pitchdetection_type type_pitch = aubio_pitch_mcomb;
+aubio_pitchdetection_type type_pitch = aubio_pitch_yinfft;
 aubio_pitchdetection_mode mode_pitch = aubio_pitchm_freq;
 
@@ -81 +81 @@
         x->o = new_aubio_pitchdetection(x->bufsize*4, 
                     x->hopsize, 1, 44100., type_pitch, mode_pitch);
+        aubio_pitchdetection_set_yinthresh(x->o, 0.7);
         x->vec = (fvec_t *)new_fvec(x->hopsize,1);
 

python/aubio/task/pitch.py

@@ -8 +8 @@
                 task.__init__(self,input,params=params)
                 self.shortlist = [0. for i in range(self.params.pitchsmooth)]
+                if self.params.pitchmode == 'yinfft':
+                        yinthresh = self.params.yinfftthresh
+                elif self.params.pitchmode == 'yin':
+                        yinthresh = self.params.yinthresh
+                else:
+                        yinthresh = 0.
                 self.pitchdet  = pitchdetection(mode=get_pitch_mode(self.params.pitchmode),
                         bufsize=self.params.bufsize,
@@ -14 +20 @@
                         samplerate=self.srate,
                         omode=self.params.omode,
-                        yinthresh=self.params.yinthresh)
+                        yinthresh=yinthresh)
 
         def __call__(self):
@@ -68 +74 @@
                                 while(tasksil.readsize==tasksil.params.hopsize):
                                         tasksil()
-                                        time.append(tasksil.params.step*tasksil.frameread)
+                                        time.append(tasksil.params.step*(tasksil.frameread))
                                         if not tasksil.issilence:
                                                 pitch.append(self.truth)
@@ -156 +162 @@
 
                         
-        def plotplot(self,wplot,oplots,outplot=None,multiplot = 1, midi = 1):
+        def plotplot(self,wplot,oplots,outplot=None,multiplot = 0, midi = 1):
                 from aubio.gnuplot import gnuplot_init, audio_to_array, make_audio_plot
                 import re
@@ -198 +204 @@
                 else: 
                         g.ylabel('pitch (midi)')
-                        g('set yrange [%f:%f]' % (40, aubio_freqtomidi(self.params.pitchmax)))
+                        g('set yrange [%f:%f]' % (aubio_freqtomidi(self.params.pitchmin), aubio_freqtomidi(self.params.pitchmax)))
                 g('set key right top')
                 g('set noclip one') 

python/aubio/task/utils.py

@@ -34 +34 @@
         elif nvalue == 'schmitt':
                  return aubio_pitch_schmitt
+        elif nvalue == 'yinfft':
+                 return aubio_pitch_yinfft
         else:
                  import sys

python/aubiopitch

@@ -90 +90 @@
 params.bufsize    = int(options.bufsize)
 params.step       = params.samplerate/float(params.hopsize)
-params.threshold  = float(options.threshold)
+params.yinthresh  = float(options.threshold)
 params.silence    = float(options.silence)
 params.verbose    = options.verbose
@@ -100 +100 @@
 if options.note:
         exit("not implemented yet")
-
 
 wplot,oplots = [],[]

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);

swig/aubio.i

@@ -191 +191 @@
         aubio_pitch_mcomb,
         aubio_pitch_schmitt,
-        aubio_pitch_fcomb
+        aubio_pitch_fcomb,
+        aubio_pitch_yinfft
 } aubio_pitchdetection_type;
 
@@ -218 +219 @@
 
 /* pitch mcomb */
-aubio_pitchmcomb_t * new_aubio_pitchmcomb(uint_t size, uint_t channels, uint_t samplerate);
+aubio_pitchmcomb_t * new_aubio_pitchmcomb(uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);
 smpl_t aubio_pitchmcomb_detect(aubio_pitchmcomb_t * p, cvec_t * fftgrain);
 uint_t aubio_pitch_cands(aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands);
@@ -227 +228 @@
 void aubio_pitchyin_getcum(fvec_t *yin);
 uint_t aubio_pitchyin_getpitch(fvec_t *yin);
-uint_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t *yin, smpl_t tol);
+smpl_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t *yin, smpl_t tol);
 
 /* pitch schmitt */