Mercurial > hg > constant-q-cpp

diff yeti/cqt.yeti @ 42:53d1e0d59ac5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use revised framer api
author Chris Cannam <c.cannam@qmul.ac.uk>
date Wed, 20 Nov 2013 14:25:54 +0000
parents ae7d2e558ed1
children f5bd00c97de3
line wrap: on
line diff
--- a/yeti/cqt.yeti	Tue Nov 19 19:27:45 2013 +0000
+++ b/yeti/cqt.yeti	Wed Nov 20 14:25:54 2013 +0000
@@ -9,6 +9,7 @@
 cplx = load may.complex;
 fft = load may.transform.fft;
 vec = load may.vector;
+ch = load may.stream.channels;
 
 { pow, round, floor, ceil, log2, nextPowerOfTwo } = load may.mathmisc;
 
@@ -40,9 +41,9 @@
 
     cqblocks =
         map do octave:
-            frames = framer.monoFrames //!!! mono for now
-                { framesize = kdata.fftSize, hop = kdata.fftHop }
-                (resample.decimated (pow 2 octave) streams[octave]);
+            frames = map ch.mixedDown //!!! mono for now
+               (framer.frames kdata.fftSize [ Hop kdata.fftHop, Padded false ]
+                   (resample.decimated (pow 2 octave) streams[octave]));
             map do frame:
                 freq = fftFunc (cplx.complexArray frame (vec.zeros kdata.fftSize));
  println "octave = \(octave), frame = \(vec.list frame)";