updated aubiocut aubiocut now seeks local minima before the peak, to cut at the beginning of the attack rather than at an arbitrary three frames ahead of the peak.

Paul Brossier committed 21 years ago

Commit 65f1edc1 parent 00e46591 file · +15 −7Browse files

Showing the changes to python (1 of 1 file). Show all

Unified · Split

@@ -7,9 +7,10 @@ · 6 unmodified lines
7	7	from aubio.aubioclass import *
8	8	import sys
9	9
	10	+bufsize = 1024
	11	+hopsize = bufsize/2
	12	+
10	13	def getonsets(filein,threshold):
11		− bufsize = 1024
12		− hopsize = bufsize/2
13	14	frameread = 0
14	15	filei = sndfile(filein)
15	16	srate = filei.samplerate()
@@ -20,20 +21,27 @@ def getonsets(filein,threshold): · 4 unmodified lines
20	21	#newname = "%s%.8f%s" % ("/tmp/",0.0000000,filein[-4:])
21	22	#fileo = sndfile(newname,model=filei)
22	23	mylist = list()
	24	+ ovalist = [0., 0., 0., 0., 0., 0.]
23	25	while(readsize==hopsize):
24	26	readsize = filei.read(hopsize,myvec)
25	27	isonset,val = opick.do(myvec)
	28	+ ovalist.append(val)
	29	+ ovalist.pop(0)
26	30	if (isonset == 1):
27		− now = (frameread-4)*hopsize/(srate+0.)
28		− #del fileo
29		− #fileo = sndfile("%s%f%s" % ("/tmp/",now,filein[-4:]),model=filei)
30		− mylist.append(now)
	31	+ print frameread
	32	+ i=len(ovalist)-1
	33	+ # find local minima
	34	+ while ovalist[i-1] < ovalist[i] and i > 0:
	35	+ i -= 1
	36	+ now = (frameread-i+1)*hopsize/(srate+0.)
	37	+ #del fileo
	38	+ #fileo = sndfile("%s%f%s" % ("/tmp/",now,filein[-4:]),model=filei)
	39	+ mylist.append(now)
31	40	#writesize = fileo.write(readsize,myoldvec)
32	41	frameread += 1
33	42	return mylist
34	43
35	44	def cutfile(filein,onsets):
36		− hopsize = 512
37	45	frameread = 0
38	46	readsize = hopsize
39	47	filei = sndfile(filein)

Keyboard shortcuts