changeset 455:38932adb6c02

Merge branch 'chroma-key-tuning-review' of ssh://github.com/c4dm/qm-dsp into chroma-key-tuning-review
author Chris Cannam <cannam@all-day-breakfast.com>
date Tue, 28 May 2019 13:41:29 +0100
parents 684319f02921 (current diff) 993046a6c730 (diff)
children bfd7d7633e1d
files
diffstat 2 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitignore	Tue May 28 13:41:29 2019 +0100
@@ -0,0 +1,12 @@
+*.o
+*~
+*.orig
+*.a
+doc/html/
+tests/test-*
+tests/test.log
+*.rej
+ext/uncertain/
+*.obj
+build/msvc/Debug/
+build/msvc/x64/Release/
--- a/tests/TestChromagram.cpp	Thu May 23 18:01:14 2019 +0100
+++ b/tests/TestChromagram.cpp	Tue May 28 13:41:29 2019 +0100
@@ -36,8 +36,9 @@
     vector<double> buffer;
     buffer.reserve(length);
     for (int i = 0; i < length; ++i) {
-        buffer.push_back(sin(i * M_PI * 2.0 * frequency / sampleRate));
+        buffer.push_back(sin((i * M_PI * 2.0 * frequency) / sampleRate));
     }
+
     return buffer;
 }
 
@@ -63,7 +64,7 @@
     
     Chromagram chroma(config);
     
-    for (int midiPitch = 48; midiPitch < 96; ++midiPitch) {
+    for (int midiPitch = 36; midiPitch < 108; ++midiPitch) {
 
         cout << endl;
 
@@ -84,7 +85,7 @@
         vector<double> signal = generateSinusoid(frequency,
                                                  sampleRate,
                                                  blockSize);
-
+        
         double *output = chroma.process(signal.data());
 
         int peakBin = -1;