comparison plugins/AdaptiveSpectrogram.h @ 153:38502a1595ff

Update for new DetectionFunction api
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 21 Oct 2013 12:02:51 +0100
parents dcf5800f0f00
children 93355d263f8e
comparison
equal deleted inserted replaced
152:979281679a39 153:38502a1595ff
176 int origin = m_maxwid/4 - m_w/4; // for 50% overlap 176 int origin = m_maxwid/4 - m_w/4; // for 50% overlap
177 for (int j = 0; j < m_w; ++j) { 177 for (int j = 0; j < m_w; ++j) {
178 m_rin[j] = m_in[origin + i * m_w/2 + j]; 178 m_rin[j] = m_in[origin + i * m_w/2 + j];
179 } 179 }
180 m_window.cut(m_rin); 180 m_window.cut(m_rin);
181 m_fft->process(false, m_rin, m_rout, m_iout); 181 m_fft->forward(m_rin, m_rout, m_iout);
182 for (int j = 0; j < m_w/2; ++j) { 182 for (int j = 0; j < m_w/2; ++j) {
183 int k = j+1; // include Nyquist but not DC 183 int k = j+1; // include Nyquist but not DC
184 double mag = sqrt(m_rout[k] * m_rout[k] + 184 double mag = sqrt(m_rout[k] * m_rout[k] +
185 m_iout[k] * m_iout[k]); 185 m_iout[k] * m_iout[k]);
186 double scaled = mag / (m_w/2); 186 double scaled = mag / (m_w/2);