Changeset 83376e9

Timestamp:

Mar 16, 2006, 4:52:50 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:

e2b1bda

Parents:

9610f0a

Message:

update task.pitch.{eval,plot}
update task.pitch.{eval,plot}

File:

• python/aubio/task/pitch.py (modified) (8 diffs)

python/aubio/task/pitch.py

@@ -13 +13 @@
                         channels=self.channels,
                         samplerate=self.srate,
-                        omode=self.params.omode)
+                        omode=self.params.omode,
+                        yinthresh=self.params.yinthresh)
 
         def __call__(self):
@@ -84 +85 @@
                                         for i in range(len(values)):
                                                 time.append(values[i][0])
-                                                pitch.append(aubio_freqtomidi(values[i][1]))
+                                                if values[i][1] == 0.0:
+                                                        pitch.append(-1.)
+                                                else:
+                                                        pitch.append(aubio_freqtomidi(values[i][1]))
                                         return time,pitch
 
@@ -105 +109 @@
                 return self.truth, self.truth-med, self.truth-avg
 
-        def eval(self,pitch,tol=0.9):
+        def eval(self,pitch,tol=0.5):
                 timet,pitcht = self.gettruth()
                 pitch = [aubio_freqtomidi(i) for i in pitch]
@@ -112 +116 @@
                                 pitch[i] = -1
                 time = [ i*self.params.step for i in range(len(pitch)) ]
-                assert len(timet) == len(time) 
+                #print len(timet),len(pitcht)
+                #print len(time),len(pitch)
+                if len(timet) != len(time):
+                        time = time[1:len(timet)+1]
+                        pitch = pitch[1:len(pitcht)+1]
+                        #pitcht = [aubio_freqtomidi(i) for i in pitcht]
+                        for i in range(len(pitcht)):
+                                if pitcht[i] == "nan" or pitcht[i] == "-inf" or pitcht[i] == -1:
+                                        pitcht[i] = -1
+                assert len(timet) == len(time)
                 assert len(pitcht) == len(pitch)
                 osil, esil, opit, epit, echr = 0, 0, 0, 0, 0
@@ -118 +131 @@
                         if pitcht[i] == -1: # currently silent
                                 osil += 1 # count a silence
-                                if pitch[i] == -1. or pitch[i] == "nan": 
+                                if pitch[i] <= 0. or pitch[i] == "nan": 
                                         esil += 1 # found a silence
                         else:
@@ -138 +151 @@
 
                 downtime = self.params.step*numarray.arange(len(pitch))
-                oplots.append(Gnuplot.Data(downtime,pitch,with='linespoints',
+                pitch = [aubio_freqtomidi(i) for i in pitch]
+                oplots.append(Gnuplot.Data(downtime,pitch,with='lines',
                         title=self.params.pitchmode))
 
                         
-        def plotplot(self,wplot,oplots,outplot=None,multiplot = 0):
+        def plotplot(self,wplot,oplots,outplot=None,multiplot = 1, midi = 1):
                 from aubio.gnuplot import gnuplot_init, audio_to_array, make_audio_plot
                 import re
@@ -153 +167 @@
                 timet,pitcht = self.gettruth()
                 if timet and pitcht:
-                        pitcht = [aubio_miditofreq(i) for i in pitcht]
                         oplots = [Gnuplot.Data(timet,pitcht,with='lines',
                                 title='ground truth')] + oplots
@@ -178 +191 @@
                 g('set origin 0,0')
                 g('set xrange [0:%f]' % max(time))
-                g('set yrange [100:%f]' % self.params.pitchmax) 
+                if not midi:
+                        g('set log y')
+                        #g.xlabel('time (s)')
+                        g.ylabel('f0 (Hz)')
+                        g('set yrange [100:%f]' % self.params.pitchmax) 
+                else: 
+                        g.ylabel('pitch (midi)')
+                        g('set yrange [%f:%f]' % (40, aubio_freqtomidi(self.params.pitchmax)))
                 g('set key right top')
                 g('set noclip one') 
                 g('set format x ""')
-                g('set log y')
-                #g.xlabel('time (s)')
-                g.ylabel('f0 (Hz)')
                 if multiplot:
                         for i in range(len(oplots)):