Changeset 3027c6e

Timestamp:

Oct 8, 2009, 8:59:23 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:

8802f92

Parents:

61316a6

Message:

python/aubio: update to latest pitch prototypes

Location:

python/aubio

Files:

• aubioclass.py (modified) (1 diff)
• task/pitch.py (modified) (2 diffs)

python/aubio/aubioclass.py

@@ -126 +126 @@
 class pitchdetection:
     def __init__(self,mode=aubio_pitch_mcomb,bufsize=2048,hopsize=1024,
-        channels=1,samplerate=44100.,omode=aubio_pitchm_freq,yinthresh=0.1):
+        channels=1,samplerate=44100.,omode=aubio_pitchm_freq,tolerance=0.1):
         self.pitchp = new_aubio_pitchdetection(bufsize,hopsize,channels,
                 samplerate,mode,omode)
-        aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh)
+        self.mypitch = fvec(1, channels)
+        aubio_pitchdetection_set_tolerance(self.pitchp,tolerance)
         #self.filt     = filter(srate,"adsgn")
     def __del__(self):
         del_aubio_pitchdetection(self.pitchp)
     def __call__(self,myvec): 
-        #self.filt(myvec)
-        return aubio_pitchdetection_do(self.pitchp,myvec())
+        aubio_pitchdetection_do(self.pitchp,myvec(), self.mypitch())
+        return self.mypitch.get(0,0)
 
 class filter:

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),
+                if self.params.pitchmode == 'yin':
+                        tolerance = self.params.yinthresh
+                elif self.params.pitchmode == 'yinfft':
+                        tolerance = self.params.yinfftthresh
+                else:
+                        tolerance = 0.
+                self.pitchdet   = pitchdetection(mode=get_pitch_mode(self.params.pitchmode),
                         bufsize=self.params.bufsize,
                         hopsize=self.params.hopsize,
@@ -20 +20 @@
                         samplerate=self.srate,
                         omode=self.params.omode,
-                        yinthresh=yinthresh)
+                        tolerance = tolerance)
 
         def __call__(self):