Changeset 71f98f1

Timestamp:

May 23, 2005, 12:40:33 AM (20 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:

296c33a

Parents:

2cdae81

Message:

add aubioplot-onset, minor fixes on aubiocut and aubioclass.py
add aubioplot-onset, minor fixes on aubiocut and aubioclass.py

Location:

python

Files:

• aubio/aubioclass.py (modified) (5 diffs)
• aubiocut (modified) (1 diff)
• aubioplot-onset (added)

python/aubio/aubioclass.py

@@ -55 +55 @@
 
 class onsetdetection:
+    """ class for aubio_onsetdetection """
     def __init__(self,type,buf,chan):
         self.od = new_aubio_onsetdetection(type,buf,chan)
@@ -63 +64 @@
 
 class peakpick:
+    """ class for aubio_peakpicker """
     def __init__(self,threshold=0.1):
         self.pp = new_aubio_peakpicker(threshold)
@@ -71 +73 @@
 
 class onsetpick:
+    """ superclass for aubio_pvoc + aubio_onsetdetection + aubio_peakpicker """
     def __init__(self,bufsize,hopsize,channels,myvec,threshold,mode='dual'):
         self.myfft    = cvec(bufsize,channels)
@@ -152 +155 @@
         return mylist
 
-
 def getonsets(filein,threshold=0.2,silence=-70.,bufsize=1024,hopsize=512,mode='dual'):
         frameread = 0
@@ -185 +187 @@
         return mylist
 
-
 class pitchpick:
     def __init__(self,bufsize,hopsize,channels,myvec,srate):

python/aubiocut

@@ -6 +6 @@
 
 from aubio.aubioclass import *
-import sys
 
 bufsize   = 1024
 hopsize   = bufsize/2
 
+def cutfile(filein,slicetimes,zerothres=0.002):
+    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 cutfile(filein,onsets):
-        frameread = 0
-        zerothres = 0.002
-        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(onsets) and frameread >= onsets[0]:
-                    onsets.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
-
+import sys
 filename  = sys.argv[1]
-threshold = sys.argv[2]
+threshold = 0.2
+if (len(sys.argv) > 2): threshold = sys.argv[2]
 onsets    = getonsets(filename,threshold)
 cutfile(filename,onsets)