# HG changeset patch
# User cannam
# Date 1175271636 0
# Node ID 12cffcc40bbcb1c1d61959f850f0bbc6c688e54b
# Parent  381758cfbe6474074a11fb9296783600bf168104
* Fixes to chromagram extents

diff -r 381758cfbe64 -r 12cffcc40bbc dsp/keydetection/GetKeyMode.cpp
--- a/dsp/keydetection/GetKeyMode.cpp	Mon Jan 22 17:32:09 2007 +0000
+++ b/dsp/keydetection/GetKeyMode.cpp	Fri Mar 30 16:20:36 2007 +0000
@@ -50,10 +50,24 @@
 //	m_ChromaConfig.min = 111.0641;
 //	m_ChromaConfig.max = 1.7770e+003;
 
+//	m_ChromaConfig.min = Pitch::getFrequencyForPitch
+//		(12, 0, tuningFrequency);
+//	m_ChromaConfig.max = Pitch::getFrequencyForPitch
+//		(96, 0, tuningFrequency);
+
+	// The chromagram minimum pitch is 1/6 of a tone above A, two
+	// octaves below middle C (for a 36-bin chromagram).  The
+	// maximum pitch is four octaves higher.
+
 	m_ChromaConfig.min = Pitch::getFrequencyForPitch
-		(12, 0, tuningFrequency);
-	m_ChromaConfig.max = Pitch::getFrequencyForPitch
-		(96, 0, tuningFrequency);
+		(45, 1.f / 3.f, tuningFrequency);
+
+	m_ChromaConfig.max = m_ChromaConfig.min * 2;
+	m_ChromaConfig.max = m_ChromaConfig.max * 2;
+	m_ChromaConfig.max = m_ChromaConfig.max * 2;
+	m_ChromaConfig.max = m_ChromaConfig.max * 2;
+
+	std::cerr << "Chromagram range: " << m_ChromaConfig.min << " -> " << m_ChromaConfig.max << std::endl;
 
 	m_ChromaConfig.BPO = 36;
 	m_ChromaConfig.CQThresh = 0.0054;