X-Git-Url: https://git.sesse.net/?p=pitch;a=blobdiff_plain;f=pitch.cpp;h=36be752bbd66e87163e71921348a95644ebf8b6b;hp=c8246dcf5f28436277ad51c6cff8bf94f145bc64;hb=cbf0d7c43e3aa06886d425c4d26c99592eb35ba6;hpb=2bb871a3a6ca4b73e8583de4de97f7b55dd1614c

diff --git a/pitch.cpp b/pitch.cpp
index c8246dc..36be752 100644
--- a/pitch.cpp
+++ b/pitch.cpp
@@ -60,7 +60,8 @@ int main()
 		fftw_execute(p);
 		find_peak_magnitudes(out, bins, FFT_LENGTH);
 		std::pair<double, double> peak = find_peak(bins, FFT_LENGTH);
-		peak = adjust_for_overtones(peak, bins, FFT_LENGTH);
+		if (peak.first > 0.0)
+			peak = adjust_for_overtones(peak, bins, FFT_LENGTH);
 
 		if (peak.first < 50.0 || peak.second - log10(FFT_LENGTH) < 0.0) {
 #if TUNING == WELL_TEMPERED_GUITAR
@@ -189,10 +190,10 @@ void find_peak_magnitudes(std::complex<double> *in, double *out, unsigned num_sa
 
 std::pair<double, double> find_peak(double *in, unsigned num_samples)
 {
-	double best_peak = in[0];
-	unsigned best_bin = 0;
+	double best_peak = in[5];
+	unsigned best_bin = 5;
 
-	for (unsigned i = 1; i < num_samples / 2 + 1; ++i) {
+	for (unsigned i = 6; i < num_samples / 2 + 1; ++i) {
 		if (in[i] > best_peak) {
 			best_peak = in[i];
 			best_bin = i;
@@ -224,9 +225,9 @@ std::pair<double, double> find_peak(double *in, unsigned num_samples)
 			best_bin /= i;
 
 			// consider sliding one bin up or down
-			if (best_bin > 0 && in[best_bin - 1] > in[best_bin] && in[best_bin - 1] > in[best_bin - 2]) {
+			if (best_bin > 1 && in[best_bin - 1] > in[best_bin] && in[best_bin - 1] > in[best_bin - 2]) {
 				--best_bin;
-			} else if (best_bin < num_samples / 2 && in[best_bin + 1] > in[best_bin] && in[best_bin + 1] > in[best_bin + 2]) {
+			} else if (best_bin < num_samples / 2 - 1 && in[best_bin + 1] > in[best_bin] && in[best_bin + 1] > in[best_bin + 2]) {
 				++best_bin;
 			}
 			   
@@ -258,6 +259,8 @@ std::pair<double, double> adjust_for_overtones(std::pair<double, double> base, d
 		unsigned middle = unsigned(floor(freq_to_bin(base.first, num_samples) * i + 0.5));
 		unsigned lower = middle - (i+1)/2, upper = middle + (i+1)/2;
 
+		if (lower < 1)
+			lower = 1;
 		if (upper >= num_samples)
 			upper = num_samples - 2;