Mercurial > hg > tuning-difference
comparison chroma-compare-plugin/TuningDifference.cpp @ 20:331a520cdadb
Update to reflect changes in Chromagram api
author | Chris Cannam |
---|---|
date | Thu, 05 Feb 2015 09:52:28 +0000 |
parents | 9c5ec36c223e |
children |
comparison
equal
deleted
inserted
replaced
19:9c5ec36c223e | 20:331a520cdadb |
---|---|
112 | 112 |
113 TuningDifference::ParameterList | 113 TuningDifference::ParameterList |
114 TuningDifference::getParameterDescriptors() const | 114 TuningDifference::getParameterDescriptors() const |
115 { | 115 { |
116 ParameterList list; | 116 ParameterList list; |
117 //!!! parameter: max search range | |
118 //!!! parameter: fine search precision | |
117 return list; | 119 return list; |
118 } | 120 } |
119 | 121 |
120 float | 122 float |
121 TuningDifference::getParameter(string) const | 123 TuningDifference::getParameter(string) const |
290 Chromagram::Parameters | 292 Chromagram::Parameters |
291 TuningDifference::paramsForTuningFrequency(double hz) const | 293 TuningDifference::paramsForTuningFrequency(double hz) const |
292 { | 294 { |
293 Chromagram::Parameters params(m_inputSampleRate); | 295 Chromagram::Parameters params(m_inputSampleRate); |
294 params.lowestOctave = 0; | 296 params.lowestOctave = 0; |
295 params.octaves = 6; | 297 params.octaveCount = 6; |
296 params.bpo = m_bpo; | 298 params.binsPerOctave = m_bpo; |
297 params.tuningFrequency = hz; | 299 params.tuningFrequency = hz; |
300 params.atomHopFactor = 0.5; | |
298 return params; | 301 return params; |
299 } | 302 } |
300 | 303 |
301 TuningDifference::TFeature | 304 TuningDifference::TFeature |
302 TuningDifference::computeFeatureFromSignal(const Signal &signal, double hz) const | 305 TuningDifference::computeFeatureFromSignal(const Signal &signal, double hz) const |
415 break; | 418 break; |
416 } | 419 } |
417 } | 420 } |
418 } | 421 } |
419 | 422 |
423 //!!! could keep a vector of scores & then interpolate... | |
424 | |
420 return pair<int, double>(bestCents, bestHz); | 425 return pair<int, double>(bestCents, bestHz); |
421 } | 426 } |
422 | 427 |
423 TuningDifference::FeatureSet | 428 TuningDifference::FeatureSet |
424 TuningDifference::getRemainingFeatures() | 429 TuningDifference::getRemainingFeatures() |