Mercurial > hg > match-vamp
changeset 40:15a7fdc02c58 refactors
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Thu, 13 Nov 2014 12:57:04 +0000 |
| parents | 8cce4e13ede3 (current diff) 2f8a802b62f9 (diff) |
| children | 9aec2304b9f6 |
| files | src/FeatureExtractor.cpp src/Matcher.cpp |
| diffstat | 2 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/FeatureExtractor.cpp Thu Nov 13 12:50:54 2014 +0000 +++ b/src/FeatureExtractor.cpp Thu Nov 13 12:57:04 2014 +0000 @@ -76,12 +76,10 @@ while (i <= m_params.fftSize/2) { double midi = log(i*binWidth/440.0) / log(2.0) * 12 + 69; if (midi > 127) midi = 127; - m_freqMap[i++] = crossoverBin + lrint(midi) - crossoverMidi; + int target = crossoverBin + lrint(midi) - crossoverMidi; + if (target >= m_featureSize) target = m_featureSize - 1; + m_freqMap[i++] = target; } - - cerr << "rate = " << m_params.sampleRate << ", m_featureSize = " << m_featureSize << ", m_freqMap[" << i << "-1] = " << m_freqMap[i-1] << endl; - - assert(m_featureSize == m_freqMap[i-1] + 1); } void
--- a/src/Matcher.cpp Thu Nov 13 12:50:54 2014 +0000 +++ b/src/Matcher.cpp Thu Nov 13 12:57:04 2014 +0000 @@ -103,7 +103,6 @@ Matcher::expand() { int distSize = (params.maxRunCount + 1) * blockSize; - bestPathCost.resize(distXSize, vector<int>(distSize, 0)); distance.resize(distXSize, vector<unsigned char>(distSize, 0)); distYSizes.resize(blockSize, distSize);