Showing the changes to python (1 of 1 file). Show all
Unified · Split
| @@ -76,7 +76,7 @@ rayparam = 48/512.*winlen · 75 unmodified lines | |||
| 76 | t = [i for i in range(hopsize)] | 76 | t = [i for i in range(hopsize)] |
| 77 | #tlong = [i for i in range(hopsize*(btstep-1))] | 77 | #tlong = [i for i in range(hopsize*(btstep-1))] |
| 78 | #tall = [i for i in range(hopsize*btstep)] | 78 | #tall = [i for i in range(hopsize*btstep)] |
| 79 | sig = [0 for i in range(hopsize*btstep)] | 79 | sig = [0 for i in range(hopsize*btstep*4)] |
| 80 | dfx = [i for i in range(winlen)] | 80 | dfx = [i for i in range(winlen)] |
| 81 | dfframe = [0 for i in range(winlen)] | 81 | dfframe = [0 for i in range(winlen)] |
| 82 | dfrev = [0 for i in range(winlen)] | 82 | dfrev = [0 for i in range(winlen)] |
| @@ -103,7 +103,7 @@ nrframe = 0 · 20 unmodified lines | |||
| 103 | while (task.readsize == params.hopsize): | 103 | while (task.readsize == params.hopsize): |
| 104 | task() | 104 | task() |
| 105 | #print task.pos2 | 105 | #print task.pos2 |
| 106 | sig[:-hopsize] = [i for i in sig[-(btstep-1)*hopsize:]] | 106 | sig[:-hopsize] = [i for i in sig[-(btstep*4-1)*hopsize:]] |
| 107 | sig[-hopsize:] = [task.myvec.get(i,0) for i in t] | 107 | sig[-hopsize:] = [task.myvec.get(i,0) for i in t] |
| 108 | 108 | ||
| 109 | #g('set xrange [%f:%f]' % (t[0],t[-1])) | 109 | #g('set xrange [%f:%f]' % (t[0],t[-1])) |
| @@ -118,7 +118,7 @@ while (task.readsize == params.hopsize): · 8 unmodified lines | |||
| 118 | aubio_autocorr(task.dfframe(),acf()); | 118 | aubio_autocorr(task.dfframe(),acf()); |
| 119 | acframe = [acf.get(i,0) for i in range(winlen/2)] | 119 | acframe = [acf.get(i,0) for i in range(winlen/2)] |
| 120 | if printframe == nrframe or printframe == -1: | 120 | if printframe == nrframe or printframe == -1: |
| 121 | d = [[plotdata(range(btstep*hopsize),sig,plottitle="input signal", with='lines')]] | 121 | d = [[plotdata(range(0,btstep*hopsize*4,4),sig[0:-1:4],plottitle="input signal", with='lines')]] |
| 122 | d += [[plotdata(range(-winlen,0),dfframe,plottitle="onset detection", with='lines')]] | 122 | d += [[plotdata(range(-winlen,0),dfframe,plottitle="onset detection", with='lines')]] |
| 123 | d += [[plotdata(range(winlen/2),acframe,plottitle="autocorrelation", with='lines')]] | 123 | d += [[plotdata(range(winlen/2),acframe,plottitle="autocorrelation", with='lines')]] |
| 124 | 124 | ||
| @@ -133,7 +133,7 @@ while (task.readsize == params.hopsize): · 8 unmodified lines | |||
| 133 | 133 | ||
| 134 | f('set size %f,%f' % (1.0*xsize,0.33*ysize) ) | 134 | f('set size %f,%f' % (1.0*xsize,0.33*ysize) ) |
| 135 | f('set orig %f,%f' % (0.0*xsize,0.66*ysize) ) | 135 | f('set orig %f,%f' % (0.0*xsize,0.66*ysize) ) |
| 136 | f('set xrange [%f:%f]' % (0,btstep*hopsize) ) | 136 | f('set xrange [%f:%f]' % (0,btstep*hopsize*4) ) |
| 137 | f('set yrange [%f:%f]' % (-1.2*max(sig),1.2*max(sig)) ) | 137 | f('set yrange [%f:%f]' % (-1.2*max(sig),1.2*max(sig)) ) |
| 138 | f.title('Input signal') | 138 | f.title('Input signal') |
| 139 | f.xlabel('time (samples)') | 139 | f.xlabel('time (samples)') |