comparison plugins/ChromagramPlugin.cpp @ 95:e51152b7ee06

* Fixes to problems shown by vamp-plugin-tester
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 23 Mar 2009 16:29:12 +0000
parents f46864eba7fd
children 4a354c18e688
comparison
equal deleted inserted replaced
94:f46864eba7fd 95:e51152b7ee06
220 220
221 m_count = 0; 221 m_count = 0;
222 222
223 m_step = m_chromagram->getHopSize(); 223 m_step = m_chromagram->getHopSize();
224 m_block = m_chromagram->getFrameSize(); 224 m_block = m_chromagram->getFrameSize();
225 if (m_step < 1) m_step = 1;
225 226
226 if (blockSize != m_block) { 227 if (blockSize != m_block) {
227 std::cerr << "ChromagramPlugin::initialise: ERROR: supplied block size " << blockSize << " differs from required block size " << m_block << ", initialise failing" << std::endl; 228 std::cerr << "ChromagramPlugin::initialise: ERROR: supplied block size " << blockSize << " differs from required block size " << m_block << ", initialise failing" << std::endl;
228 delete m_chromagram; 229 delete m_chromagram;
229 m_chromagram = 0; 230 m_chromagram = 0;
255 { 256 {
256 if (!m_step) { 257 if (!m_step) {
257 Chromagram chroma(m_config); 258 Chromagram chroma(m_config);
258 m_step = chroma.getHopSize(); 259 m_step = chroma.getHopSize();
259 m_block = chroma.getFrameSize(); 260 m_block = chroma.getFrameSize();
261 if (m_step < 1) m_step = 1;
260 } 262 }
261 263
262 return m_step; 264 return m_step;
263 } 265 }
264 266
267 { 269 {
268 if (!m_block) { 270 if (!m_block) {
269 Chromagram chroma(m_config); 271 Chromagram chroma(m_config);
270 m_step = chroma.getHopSize(); 272 m_step = chroma.getHopSize();
271 m_block = chroma.getFrameSize(); 273 m_block = chroma.getFrameSize();
274 if (m_step < 1) m_step = 1;
272 } 275 }
273 276
274 return m_block; 277 return m_block;
275 } 278 }
276 279