Changeset 98df9f4 for python/aubio/aubioclass.py

Timestamp:

May 28, 2005, 11:06:33 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:

6b384f3

Parents:

ead2920

Message:

cleaned up getonsets, merged aubioonset and aubiocut, added some options

File:

• python/aubio/aubioclass.py (modified) (4 diffs)

python/aubio/aubioclass.py

@@ -96 +96 @@
         return self.pp.do(self.myonset),self.myonset.get(0,0)
 
-def getonsetsfunc(filein,threshold,silence,bufsize=1024,hopsize=512,mode='dual'):
-        #bufsize   = 1024
-        #hopsize   = bufsize/2
+def getonsets(filein,threshold=0.2,silence=-70.,bufsize=1024,hopsize=512,mode='dual',localmin=False,storefunc=False):
         frameread = 0
         filei     = sndfile(filein)
@@ -106 +104 @@
         opick     = onsetpick(bufsize,hopsize,channels,myvec,threshold,mode=mode)
         mylist    = list()
-        #ovalist   = [0., 0., 0., 0., 0., 0.]
-        ovalist   = [0., 0., 0., 0., 0.]
-        ofunclist = []
+        if localmin:
+                ovalist   = [0., 0., 0., 0., 0.]
+        if storefunc:
+                ofunclist = []
         while(readsize):
                 readsize = filei.read(hopsize,myvec)
@@ -114 +113 @@
                 if (aubio_silence_detection(myvec(),silence)):
                         isonset=0
-                ovalist.append(val)
-                ovalist.pop(0)
-                ofunclist.append(val)
+                if localmin:
+                        ovalist.append(val)
+                        ovalist.pop(0)
+                if storefunc:
+                        ofunclist.append(val)
                 if (isonset == 1):
-                        i=len(ovalist)-1
-                        # find local minima before peak 
-                        while ovalist[i-1] < ovalist[i] and i > 0:
-                                i -= 1
-                        now = (frameread+1-i)
+                        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)
@@ -129 +133 @@
                                 mylist.append(now)
                 frameread += 1
-        return mylist, ofunclist
+        if storefunc: return mylist, ofunclist
+        else: return mylist
 
+def cutfile(filein,slicetimes,zerothres=0.002,bufsize=1024,hopsize=512):
+    frameread = 0
+    readsize  = hopsize 
+    filei     = sndfile(filein)
+    framestep = hopsize/(filei.samplerate()+0.)
+    channels  = filei.channels()
+    newname   = "%s%f%s" % ("/tmp/",0.0000000,filein[-4:])
+    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%f%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 getonsetscausal(filein,threshold,silence,bufsize=1024,hopsize=512,mode='dual'):
-        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)
-        mylist    = list()
-        while(readsize):
-                readsize = filei.read(hopsize,myvec)
-                isonset,val = opick.do(myvec)
-                if (aubio_silence_detection(myvec(),silence)):
-                        isonset=0
-                if (isonset == 1):
-                        now = frameread
-                        if now > 0 :
-                                mylist.append(now)
-                        else:
-                                now = 0
-                                mylist.append(now)
-                frameread += 1
-        return mylist
-
-def getonsets(filein,threshold=0.2,silence=-70.,bufsize=1024,hopsize=512,mode='dual'):
-        frameread = 0
-        filei     = sndfile(filein)
-        channels  = filei.channels()
-        samplerate= filei.samplerate()
-        myvec     = fvec(hopsize,channels)
-        readsize  = filei.read(hopsize,myvec)
-        opick     = onsetpick(bufsize,hopsize,channels,myvec,threshold,mode=mode)
-        mylist    = list()
-        #ovalist   = [0., 0., 0., 0., 0., 0.]
-        ovalist   = [0., 0., 0., 0., 0.]
-        while(readsize):
-                readsize = filei.read(hopsize,myvec)
-                isonset,val = opick.do(myvec)
-                if (aubio_silence_detection(myvec(),silence)):
-                        isonset=0
-                ovalist.append(val)
-                ovalist.pop(0)
-                if (isonset == 1):
-                        i=len(ovalist)-1
-                        # find local minima before peak 
-                        while ovalist[i-1] < ovalist[i] and i > 0:
-                                i -= 1
-                        now = (frameread+1-i)
-                        if now > 0 :
-                                mylist.append(now)
-                        else:
-                                now = 0
-                                mylist.append(now)
-                frameread += 1
-        return mylist
 
 class pitchpick: