Mercurial > hg > tuning-difference
diff src/TuningDifference.cpp @ 24:6a75d371938f
Some speed improvements
author | Chris Cannam |
---|---|
date | Fri, 06 Feb 2015 09:01:34 +0000 |
parents | d660db57e902 |
children | 85714824256a |
line wrap: on
line diff
--- a/src/TuningDifference.cpp Thu Feb 05 10:38:19 2015 +0000 +++ b/src/TuningDifference.cpp Fri Feb 06 09:01:34 2015 +0000 @@ -304,11 +304,12 @@ TuningDifference::paramsForTuningFrequency(double hz) const { Chromagram::Parameters params(m_inputSampleRate); - params.lowestOctave = 0; - params.octaveCount = 6; + params.lowestOctave = 2; + params.octaveCount = 4; params.binsPerOctave = m_bpo; params.tuningFrequency = hz; params.atomHopFactor = 0.5; + params.window = CQParameters::Hann; return params; } @@ -463,7 +464,12 @@ double coarseHz = frequencyForCentsAbove440(coarseCents); - TFeature coarseFeature = computeFeatureFromSignal(m_other, coarseHz); + TFeature coarseFeature; + if (rotation == 0) { + coarseFeature = otherFeature; + } else { + coarseFeature = computeFeatureFromSignal(m_other, coarseHz); + } double coarseScore = featureDistance(coarseFeature); cerr << "corresponding Hz " << coarseHz << " scores " << coarseScore << endl;