Mercurial > hg > may
changeset 499:8fdcf2fec5bd redo_framer
Fixes toward framer overhaul
| author | Chris Cannam |
|---|---|
| date | Tue, 19 Nov 2013 20:44:09 +0000 |
| parents | 295b66046da3 |
| children | d81c3c824cde |
| files | src/may/feature/specdiff.yeti src/may/stream/convolve.yeti src/may/vamp.yeti |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/may/feature/specdiff.yeti Tue Nov 19 19:26:48 2013 +0000 +++ b/src/may/feature/specdiff.yeti Tue Nov 19 20:44:09 2013 +0000 @@ -2,12 +2,13 @@ module may.feature.specdiff; fr = load may.stream.framer; -cplx = load may.complex; +ch = load may.stream.channels; +cm = load may.matrix.complex; load may.feature.feature; specdiff frames = - features magdiff (map cplx.magnitudes frames); + features magdiff (map ch.mixedDown frames); specdiffOfFile framesize w filename = specdiff
--- a/src/may/stream/convolve.yeti Tue Nov 19 19:26:48 2013 +0000 +++ b/src/may/stream/convolve.yeti Tue Nov 19 20:44:09 2013 +0000 @@ -23,7 +23,7 @@ do stream: padded = (map (mat.resizedTo { rows = channels, columns = framesize * 2 }) - (fr.frames { framesize, hop = framesize } stream)); + (fr.frames framesize [ Hop framesize ] stream)); map do fr: concat (map forwardTransform (mat.asRows fr)) done padded; done);
--- a/src/may/vamp.yeti Tue Nov 19 19:26:48 2013 +0000 +++ b/src/may/vamp.yeti Tue Nov 19 20:44:09 2013 +0000 @@ -265,8 +265,7 @@ p, sampleRate = stream.sampleRate, channels = 1, - blockSize, // We refer to blockSize throughout because so does Vamp... - framesize = blockSize, // ... but the framer uses framesize + blockSize, hop = stepSize }; if p.initialise params then @@ -280,7 +279,7 @@ sampleRate = stream.sampleRate }, features = converted params outputNo - (processed params (fr.frames params stream) 0) + (processed params (fr.frames blockSize [ Hop stepSize ] stream) 0) }; // If processing completed successfully, then p is // disposed by processed and stream is closed by the