Changeset 0fe9aab

Timestamp:

Mar 1, 2006, 4:18:18 AM (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:

1e3089c

Parents:

300adc3

Message:

simplify aubiopitch
simplify aubiopitch

File:

• python/aubiopitch (modified) (2 diffs)

python/aubiopitch

@@ -86 +86 @@
 filename   = options.filename
 params = taskparams()
-#params.samplerate = float(sndfile(filename).samplerate())
+params.samplerate = float(sndfile(filename).samplerate())
 params.hopsize    = int(options.hopsize)
 params.bufsize    = int(options.bufsize)
-#params.step       = float(samplerate)/float(hopsize)
+params.step       = params.samplerate/float(params.hopsize)
 params.threshold  = float(options.threshold)
 params.silence    = float(options.silence)
+params.verbose    = options.verbose
 #mintol     = float(options.mintol)*step
 # default take back system delay
@@ -101 +102 @@
 
 
-pitch = []
+wplot,oplots = [],[]
 modes = options.mode.split(',')
 for i in range(len(modes)):
+        pitch = []
         params.pitchmode  = modes[i]
-        dotask = taskpitch
-        #pitch.append(getpitch(filename, #threshold,
-        #       mode=mode[i],
-        #       omode=options.omode,
-        #       bufsize=bufsize,hopsize=hopsize,
-        #       silence=silence))
-        filetask = dotask(filename,params=params)
-        pitch.append(filetask.compute_all())
-        for j in range(len(pitch[i])):
-                if pitch[i][j] > 10000 or pitch[i][j] < 40:
-                        pitch[i][j] = 0.;
+        filetask = taskpitch(filename,params=params)
+        pitch = filetask.compute_all()
+        #print filetask.eval(pitch[i]) 
+        filetask.plot(pitch,wplot,oplots)
 
-        if options.verbose:
-                for j in range(len(pitch[i])): 
-                        print "%f\t" % (j/params.step),
-                        print "%f\t" % pitch[i][j],
-                        print
-
-        if options.plot:
-                filetask.plot(pitch,outplot=options.outplot)
+filetask.plotplot(wplot,oplots,outplot=options.outplot)