Changeset 5e491b3b for python/aubio

Timestamp:

Aug 28, 2005, 7:58:31 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:

3c86eb1

Parents:

4cc9fe5

Message:

massive changes from cam

Location:

python/aubio

Files:

• aubioclass.py (modified) (1 diff)
• gnuplot.py (modified) (7 diffs)
• tasks.py (added)

python/aubio/aubioclass.py

@@ -106 +106 @@
         return self.pp.do(self.myonset),self.myonset.get(0,0)
 
-def check_onset_mode(option, opt, value, parser):
-        nvalue = parser.rargs[0]
-        if   nvalue == 'complexdomain' or nvalue == 'complex' :
-                 setattr(parser.values, option.dest, aubio_onset_complex)
-        elif nvalue == 'hfc'           :
-                 setattr(parser.values, option.dest, aubio_onset_hfc)
-        elif nvalue == 'phase'         :
-                 setattr(parser.values, option.dest, aubio_onset_phase)
-        elif nvalue == 'specdiff'      :
-                 setattr(parser.values, option.dest, aubio_onset_specdiff)
-        elif nvalue == 'energy'        :
-                 setattr(parser.values, option.dest, aubio_onset_energy)
-        elif nvalue == 'kl'            :
-                 setattr(parser.values, option.dest, aubio_onset_kl)
-        elif nvalue == 'mkl'           :
-                 setattr(parser.values, option.dest, aubio_onset_mkl)
-        elif nvalue == 'dual'          :
-                 setattr(parser.values, option.dest, 'dual')
-        else:
-                 print "unknown onset detection function selected"
-                 sys.exit(1)
-
-def check_pitch_mode(option, opt, value, parser):
-        nvalue = parser.rargs[0]
-        if   nvalue == 'mcomb'  :
-                 setattr(parser.values, option.dest, aubio_pitch_mcomb)
-        elif nvalue == 'yin'    :
-                 setattr(parser.values, option.dest, aubio_pitch_yin)
-        elif nvalue == 'fcomb'  :
-                 setattr(parser.values, option.dest, aubio_pitch_fcomb)
-        elif nvalue == 'schmitt':
-                 setattr(parser.values, option.dest, aubio_pitch_schmitt)
-        else:
-                 print "error: unknown pitch detection function selected"
-                 sys.exit(1)
-
-def check_pitchm_mode(option, opt, value, parser):
-        nvalue = parser.rargs[0]
-        if   nvalue == 'freq'  :
-                 setattr(parser.values, option.dest, aubio_pitchm_freq)
-        elif nvalue == 'midi'  :
-                 setattr(parser.values, option.dest, aubio_pitchm_midi)
-        elif nvalue == 'cent'  :
-                 setattr(parser.values, option.dest, aubio_pitchm_cent)
-        elif nvalue == 'bin'   :
-                 setattr(parser.values, option.dest, aubio_pitchm_bin)
-        else:
-                 print "error: unknown pitch detection output selected"
-                 sys.exit(1)
-
-
-def getonsets(filein,threshold=0.2,silence=-70.,bufsize=1024,hopsize=512,
-                mode='dual',localmin=False,storefunc=False,derivate=False):
-        frameread = 0
-        filei     = sndfile(filein)
-        channels  = filei.channels()
-        myvec     = fvec(hopsize,channels)
-        readsize  = filei.read(hopsize,myvec)
-        opick     = onsetpick(bufsize,hopsize,channels,myvec,threshold,
-                         mode=mode,derivate=derivate)
-        mylist    = list()
-        if localmin:
-                ovalist   = [0., 0., 0., 0., 0.]
-        if storefunc:
-                ofunclist = []
-        while(readsize):
-                readsize = filei.read(hopsize,myvec)
-                isonset,val = opick.do(myvec)
-                if (aubio_silence_detection(myvec(),silence)):
-                        isonset=0
-                if localmin:
-                        if val > 0: ovalist.append(val)
-                        else: ovalist.append(0)
-                        ovalist.pop(0)
-                if storefunc:
-                        ofunclist.append(val)
-                if (isonset == 1):
-                        if localmin:
-                                i=len(ovalist)-1
-                                # find local minima before peak 
-                                while ovalist[i-1] < ovalist[i] and i > 0:
-                                        i -= 1
-                                now = (frameread+1-i)
-                        else:
-                                now = frameread
-                        if now > 0 :
-                                mylist.append(now)
-                        else:
-                                now = 0
-                                mylist.append(now)
-                frameread += 1
-        if storefunc: return mylist, ofunclist
-        else: return mylist
-
-def cutfile(filein,slicetimes,zerothres=0.008,bufsize=1024,hopsize=512):
-    frameread = 0
-    readsize  = hopsize 
-    filei     = sndfile(filein)
-    framestep = hopsize/(filei.samplerate()+0.)
-    channels  = filei.channels()
-    newname   = "%s%s%09.5f%s%s" % (filein.split(".")[0].split("/")[-1],".",
-                frameread*framestep,".",filein.split(".")[-1])
-    fileo     = sndfile(newname,model=filei)
-    myvec     = fvec(hopsize,channels)
-    mycopy    = fvec(hopsize,channels)
-    while(readsize==hopsize):
-        readsize = filei.read(hopsize,myvec)
-        # write to current file
-        if len(slicetimes) and frameread >= slicetimes[0]:
-            slicetimes.pop(0)
-            # write up to 1st zero crossing
-            zerocross = 0
-            while ( abs( myvec.get(zerocross,0) ) > zerothres ):
-                zerocross += 1
-            writesize = fileo.write(zerocross,myvec)
-            fromcross = 0
-            while (zerocross < readsize):
-                for i in range(channels):
-                    mycopy.set(myvec.get(zerocross,i),fromcross,i)
-                    fromcross += 1
-                    zerocross += 1
-            del fileo
-            fileo = sndfile("%s%s%09.5f%s%s" % 
-                (filein.split(".")[0].split("/")[-1],".",
-                frameread*framestep,".",filein.split(".")[-1]),model=filei)
-            writesize = fileo.write(fromcross,mycopy)
-        else:
-            writesize = fileo.write(readsize,myvec)
-        frameread += 1
-    del fileo
-
-
-def getsilences(filein,hopsize=512,silence=-70):
-    frameread = 0
-    filei     = sndfile(filein)
-    srate     = filei.samplerate()
-    channels  = filei.channels()
-    myvec     = fvec(hopsize,channels)
-    readsize  = filei.read(hopsize,myvec)
-    mylist    = []
-    wassilence = 0
-    while(readsize==hopsize):
-        readsize = filei.read(hopsize,myvec)
-        if (aubio_silence_detection(myvec(),silence)==1):
-            if wassilence == 0:
-                mylist.append(frameread)
-                wassilence == 1
-        else: wassilence = 0
-        frameread += 1
-    return mylist
-
-def getpitch(filein,mode=aubio_pitch_mcomb,bufsize=1024,hopsize=512,omode=aubio_pitchm_freq,
-        samplerate=44100.,silence=-70):
-    frameread = 0
-    filei     = sndfile(filein)
-    srate     = filei.samplerate()
-    channels  = filei.channels()
-    myvec     = fvec(hopsize,channels)
-    readsize  = filei.read(hopsize,myvec)
-    pitchdet  = pitchdetection(mode=mode,bufsize=bufsize,hopsize=hopsize,
-                         channels=channels,samplerate=srate,omode=omode)
-    mylist    = []
-    while(readsize==hopsize):
-        readsize = filei.read(hopsize,myvec)
-        freq = pitchdet(myvec)
-        #print "%.3f     %.2f" % (now,freq)
-        if (aubio_silence_detection(myvec(),silence)!=1):
-                mylist.append(freq)
-        else: 
-                mylist.append(-1.)
-        frameread += 1
-    return mylist
-
 class pitchdetection:
     def __init__(self,mode=aubio_pitch_mcomb,bufsize=2048,hopsize=1024,

python/aubio/gnuplot.py

@@ -151 +151 @@
         from aubio.onsetcompare import onset_roc
 
-        if len(onsets) == 0: onsets = [0.];
-
-        # onset detection function 
-        downtime = (hopsize/samplerate)*numarray.arange(len(ofunc))
-        d = Gnuplot.Data(downtime,ofunc,with='lines') 
-
-        # detected onsets
-        x1 = (hopsize/samplerate)*numarray.array(onsets)
-        y1 = max(ofunc)*numarray.ones(len(onsets))
-        e = Gnuplot.Data(x1,-y1,with='impulses') 
-        e2= Gnuplot.Data(x1,y1,with='impulses') 
+        d,d2 = [],[]
+        maxofunc = 0
+        for i in range(len(onsets)):
+                if len(onsets[i]) == 0: onsets[i] = [0.];
+
+                # onset detection function 
+                downtime = (hopsize/samplerate)*numarray.arange(len(ofunc[i]))
+                d.append(Gnuplot.Data(downtime,ofunc[i],with='lines'))
+                maxofunc = max(max(ofunc[i]), maxofunc)
+
+        for i in range(len(onsets)):
+                # detected onsets
+                x1 = (hopsize/samplerate)*numarray.array(onsets[i])
+                y1 = maxofunc*numarray.ones(len(onsets[i]))
+                d.append(Gnuplot.Data(x1,y1,with='impulses'))
+                d2.append(Gnuplot.Data(x1,-y1,with='impulses'))
 
         # check if datafile exists truth
@@ -170 +175 @@
         else:
                 t_onsets = aubio.txtfile.read_datafile(datafile)
-                y2 = max(ofunc)*numarray.ones(len(t_onsets))
+                y2 = maxofunc*numarray.ones(len(t_onsets))
                 x2 = numarray.array(t_onsets).resize(len(t_onsets))
-                t = Gnuplot.Data(x2,y2,with='impulses') 
+                d2.append(Gnuplot.Data(x2,y2,with='impulses'))
                 
                 tol = 0.050 
@@ -189 +194 @@
         # audio data
         time,data = audio_to_array(filename)
-        f = make_audio_plot(time,data)
+        d2.append(make_audio_plot(time,data))
 
         # prepare the plot
@@ -212 +217 @@
         g('set yrange [-1:1]') 
         g.ylabel('amplitude')
-        g.plot(f,e,t)
+        g.plot(*d2)
         
         g('unset title')
@@ -219 +224 @@
         g('set size 1,0.7')
         g('set origin 0,0')
-        g('set xrange [0:%f]' % (hopsize/samplerate*len(ofunc)))
-        g('set yrange [0:%f]' % (max(ofunc)*1.01))
+        g('set xrange [0:%f]' % (hopsize/samplerate*len(ofunc[0])))
+        g('set yrange [0:%f]' % (maxofunc*1.01))
         g.xlabel('time')
         g.ylabel('onset detection value')
-        g.plot(d,e2)
+        g.plot(*d)
 
         g('unset multiplot')
@@ -233 +238 @@
         import numarray
 
-        # onset detection function 
-        downtime = (hopsize/samplerate)*numarray.arange(len(pitch))
-        d = Gnuplot.Data(downtime,pitch,with='lines') 
+        d = []
+        maxpitch = 100
+        for i in range(len(pitch)):
+                downtime = (hopsize/samplerate)*numarray.arange(len(pitch[i]))
+                d.append(Gnuplot.Data(downtime,pitch[i],with='lines'))
+                maxpitch = max(maxpitch,max(pitch[i][:])*1.1)
 
         # check if datafile exists truth
@@ -291 +299 @@
         g('set size 1,0.7')
         g('set origin 0,0')
-        g('set xrange [0:%f]' % (hopsize/samplerate*len(pitch)))
-        g('set yrange [0:%f]' % (max(pitch)*1.01))
+        g('set xrange [0:%f]' % max(time))
+        g('set yrange [40:%f]' % maxpitch) 
         g.xlabel('time')
         g.ylabel('frequency (Hz)')
-        g.plot(d,t)
+        g.plot(*d)
 
         g('unset multiplot')