Mercurial > hg > sonic-annotator
comparison runner/FeatureExtractionManager.cpp @ 195:3f7c65f26559
Fixes from last merge
author | Chris Cannam |
---|---|
date | Wed, 26 Aug 2015 21:46:52 +0100 |
parents | 795d67a5e266 |
children | 3b7ec45abd1c |
comparison
equal
deleted
inserted
replaced
194:c71d6ae15882 | 195:3f7c65f26559 |
---|---|
748 for (int i = startFrame; i < endFrame; i += m_blockSize) { | 748 for (int i = startFrame; i < endFrame; i += m_blockSize) { |
749 | 749 |
750 //!!! inefficient, although much of the inefficiency may be | 750 //!!! inefficient, although much of the inefficiency may be |
751 // susceptible to compiler optimisation | 751 // susceptible to compiler optimisation |
752 | 752 |
753 SampleBlock frames; | 753 SampleBlock frames = reader->getInterleavedFrames(i, m_blockSize); |
754 reader->getInterleavedFrames(i, m_blockSize, frames); | |
755 | 754 |
756 // We have to do our own channel handling here; we can't just | 755 // We have to do our own channel handling here; we can't just |
757 // leave it to the plugin adapter because the same plugin | 756 // leave it to the plugin adapter because the same plugin |
758 // adapter may have to serve for input files with various | 757 // adapter may have to serve for input files with various |
759 // numbers of channels (so the adapter is simply configured | 758 // numbers of channels (so the adapter is simply configured |