Changeset 650e39b for python/aubio

Timestamp:

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

4798fdf

Parents:

4994ebb

Message:

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

Location:

python/aubio/task

Files:

• pitch.py (modified) (5 diffs)
• utils.py (modified) (1 diff)

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