X-Git-Url: https://git.sesse.net/?p=pitch;a=blobdiff_plain;f=pitch.cpp;h=eac947c775c4001e558dac01e156f1928fb0c0e9;hp=1f639d6a22340d0b34d43e74288ad4646c54668a;hb=67bcecfdd519329d303d315e08733d1d27db6225;hpb=8f327b03f0a9726c98a81d83ed55ed264b2afc3f

diff --git a/pitch.cpp b/pitch.cpp
index 1f639d6..eac947c 100644
--- a/pitch.cpp
+++ b/pitch.cpp
@@ -46,7 +46,7 @@ int main()
 	in = reinterpret_cast<double *> (fftw_malloc(sizeof(double) * FFT_LENGTH / PAD_FACTOR));
 	in_windowed = reinterpret_cast<double *> (fftw_malloc(sizeof(double) * FFT_LENGTH));
 	out = reinterpret_cast<std::complex<double> *> (fftw_malloc(sizeof(std::complex<double>) * (FFT_LENGTH / 2 + 1)));
-	bins = reinterpret_cast<double *> (fftw_malloc(sizeof(double) * FFT_LENGTH / 2 + 1));
+	bins = reinterpret_cast<double *> (fftw_malloc(sizeof(double) * (FFT_LENGTH / 2 + 1)));
 
 	memset(in, 0, sizeof(double) * FFT_LENGTH / PAD_FACTOR);
 
@@ -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
@@ -93,6 +94,11 @@ int get_dsp_fd()
 	int rate = SAMPLE_RATE;
 	ioctl(fd, SOUND_PCM_WRITE_RATE, &rate);
 
+	int max_fragments = 2;
+	int frag_shift = ffs(FFT_LENGTH / OVERLAP) - 1;
+	int fragments = (max_fragments << 16) | frag_shift;
+        ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &fragments);
+	
 	ioctl(3, SNDCTL_DSP_SYNC, 0);
 	
 	return fd;
@@ -219,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;
 			}
 			   
@@ -229,6 +235,9 @@ std::pair<double, double> find_peak(double *in, unsigned num_samples)
 		}
 	}
 
+	if (best_bin == 0 || best_bin == num_samples / 2) {
+		return std::make_pair(-1.0, 0.0);
+	}
 	std::pair<double, double> peak = 
 		interpolate_peak(in[best_bin - 1],
 				 in[best_bin],
@@ -243,12 +252,15 @@ std::pair<double, double> find_peak(double *in, unsigned num_samples)
 std::pair<double, double> adjust_for_overtones(std::pair<double, double> base, double *in, unsigned num_samples)
 {
 	double mu = base.first, var = 1.0 / (base.second * base.second);
-	printf("mu=%f, var=%f\n", mu, var);
+		
+	//printf("Base at %.2f (amp=%5.2fdB)\n", base.first, base.second);
 
 	for (unsigned i = 2; i < 10; ++i) {
 		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;
 
@@ -283,8 +295,6 @@ std::pair<double, double> adjust_for_overtones(std::pair<double, double> base, d
 		double k = var / (var + this_var);
 		mu = (1.0 - k) * mu + k * this_mu;
 		var *= (1.0 - k);
-
-		printf("mu=%f, var=%f\n", mu, var);
 	}
 	return std::make_pair(mu, base.second);
 }