[Performous-commit] Lasse Karkkainen : Fix a bug with missing fundamental processing

[Lasse Kärkkäi. <tr...@us...>]

Module: editor
Branch: master
Commit: 7eceb8e175d0b50e8503a9d95c119b3fdfe4e976

Author: Lasse Karkkainen <tro...@tr...>
Date:   Tue Feb  8 17:00:48 2011 +0100

Fix a bug with missing fundamental processing

---

 pitch.cc |    8 +++++---
 pitch.hh |    3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pitch.cc b/pitch.cc
index 903eeb2..176e6e1 100644
--- a/pitch.cc
+++ b/pitch.cc
@@ -82,7 +82,7 @@ void Analyzer::calcTones() {
 	Combos combos;
 	for (size_t k = kMin; k < kMax; ++k) {
 		Peak const& p = m_peaks[k];
-		bool ok = p.level > 1e-6 && p.freq >= FFT_MINFREQ && p.freq <= FFT_MAXFREQ;
+		bool ok = p.level > 1e-4 && p.freq >= FFT_MINFREQ && p.freq <= FFT_MAXFREQ && std::abs(p.freqFFT - p.freq) < freqPerBin;
 		if (!ok) continue;
 		// Do we need to add a new Combo (rather than using the last one)?
 		if (combos.empty() || !combos.back().match(p.freq)) combos.push_back(Combo());
@@ -93,7 +93,7 @@ void Analyzer::calcTones() {
 		it->freq /= it->level;
 	}
 	// Only keep a reasonable amount of strongest combos
-	std::sort(combos.rbegin(), combos.rend(), Combo::cmpByLevel);
+	std::sort(combos.begin(), combos.end(), Combo::cmpByLevel);
 	if (combos.size() > 20) combos.resize(20);
 	// The order may not be strictly correct, fix it...
 	std::sort(combos.begin(), combos.end(), Combo::cmpByFreq);
@@ -102,6 +102,7 @@ void Analyzer::calcTones() {
 	for (Combos::const_iterator it = combos.begin(), itend = combos.end(); it != itend; ++it) {
 		Tone tone;
 		for (int div = 1; div <= 3; ++div) {  // Missing fundamental processing
+			int plausibleHarmonics = 0;
 			double basefreq = it->freq / div;
 			if (basefreq < FFT_MINFREQ) break;  // Do not try any lower frequencies
 			for (Combos::const_iterator harm = it; harm != itend; ++harm) {
@@ -110,11 +111,13 @@ void Analyzer::calcTones() {
 				if (n > Tone::MAXHARM) break; // No more harmonics can be found
 				if (std::abs(ratio - n) > 0.03) continue; // Frequency doesn't match
 				if (n == 0) throw std::logic_error("combos not correctly sorted");
+				if (n % div != 0) ++plausibleHarmonics;
 				double l = harm->level;
 				tone.harmonics[n - 1] += l;
 				tone.level += l;
 				tone.freq += l * harm->freq / n;  // The sum of all harmonics' fundies (weighted by l)
 			}
+			if (div > 1 && plausibleHarmonics < 3) continue;  // Not a proper missing fundamental
 			tone.freq /= tone.level;  // Average instead of sum
 			tones.push_back(tone);
 		}
@@ -129,7 +132,6 @@ void Analyzer::calcTones() {
 			double diff = std::abs(ratio - round(ratio));
 			bool erase = false;
 			if (diff < 0.02 && it2->level < 2.0 * it->level) erase = true;  // Precisely harmonic and not much stronger than fundamental
-			else if (diff < 0.06 && it2->harmonics[0] == 0.0) erase = true;  // Missing fundamental
 			// Perform the action
 			if (erase) it2 = tones.erase(it2); else ++it2;
 		}
diff --git a/pitch.hh b/pitch.hh
index bffa523..d8c78a5 100644
--- a/pitch.hh
+++ b/pitch.hh
@@ -21,6 +21,7 @@ struct Tone {
 	// Linked list of a continuous tone
 	Tone* prev;
 	Tone* next;
+	static bool cmpByLevel(Tone const& a, Tone const& b) { return a.level > b.level; }
 };
 
 static inline bool operator==(Tone const& lhs, Tone const& rhs) { return lhs == rhs.freq; }
@@ -55,7 +56,7 @@ struct Combo {
 	void combine(Peak const& p);
 	bool match(double freqOther) const;
 	static bool cmpByFreq(Combo const& a, Combo const& b) { return a.freq < b.freq; }
-	static bool cmpByLevel(Combo const& a, Combo const& b) { return a.level < b.level; }
+	static bool cmpByLevel(Combo const& a, Combo const& b) { return a.level > b.level; }
 };