X-Git-Url: https://git.sesse.net/?p=pitch;a=blobdiff_plain;f=pitch.cpp;h=91afda5fb0618d7f0e611223f1089980f1a123ee;hp=c8246dcf5f28436277ad51c6cff8bf94f145bc64;hb=1a261eee89e163b53a334eeb57850f16d476c2df;hpb=2bb871a3a6ca4b73e8583de4de97f7b55dd1614c

diff --git a/pitch.cpp b/pitch.cpp
index c8246dc..91afda5 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
@@ -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;
 			}