Mercurial > hg > tuning-difference

changeset 20:331a520cdadb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to reflect changes in Chromagram api
author Chris Cannam
date Thu, 05 Feb 2015 09:52:28 +0000
parents 9c5ec36c223e
children d660db57e902
files chroma-compare-plugin/Makefile.linux chroma-compare-plugin/TuningDifference.cpp
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/chroma-compare-plugin/Makefile.linux	Thu Feb 05 09:43:31 2015 +0000
+++ b/chroma-compare-plugin/Makefile.linux	Thu Feb 05 09:52:28 2015 +0000
@@ -1,11 +1,11 @@
 
 # For a debug build...
 
-CXXFLAGS	:= -Wall -Wextra -Werror -g -fPIC -std=c++11
+#CXXFLAGS	:= -Wall -Wextra -Werror -g -fPIC -std=c++11
 
 # ... or for a release build
 
-#CXXFLAGS	:= -Wall -Wextra -Werror -O3 -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC -std=c++11
+CXXFLAGS	:= -Wall -Wextra -Werror -O3 -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC -std=c++11
 
 
 # Location of Vamp plugin SDK relative to the project directory
--- a/chroma-compare-plugin/TuningDifference.cpp	Thu Feb 05 09:43:31 2015 +0000
+++ b/chroma-compare-plugin/TuningDifference.cpp	Thu Feb 05 09:52:28 2015 +0000
@@ -114,6 +114,8 @@
 TuningDifference::getParameterDescriptors() const
 {
     ParameterList list;
+    //!!! parameter: max search range
+    //!!! parameter: fine search precision
     return list;
 }
 
@@ -292,9 +294,10 @@
 {
     Chromagram::Parameters params(m_inputSampleRate);
     params.lowestOctave = 0;
-    params.octaves = 6;
-    params.bpo = m_bpo;
+    params.octaveCount = 6;
+    params.binsPerOctave = m_bpo;
     params.tuningFrequency = hz;
+    params.atomHopFactor = 0.5;
     return params;
 }
 
@@ -417,6 +420,8 @@
 	}
     }
 
+    //!!! could keep a vector of scores & then interpolate...
+    
     return pair<int, double>(bestCents, bestHz);
 }