X-Git-Url: https://git.sesse.net/?p=pitch;a=blobdiff_plain;f=pitch.cpp;h=97238f5f05b1a99113837029199f44434b1f220e;hp=4e0e3eba09fda41c971c9289ebb831662a6faa58;hb=f4906bf100acb8c5875196b7c2306effdd6a091d;hpb=ed42daa790cfe2942c8c83a729bbce3744bae89b;ds=sidebyside

diff --git a/pitch.cpp b/pitch.cpp
index 4e0e3eb..97238f5 100644
--- a/pitch.cpp
+++ b/pitch.cpp
@@ -93,7 +93,9 @@ int get_dsp_fd()
 	int rate = SAMPLE_RATE;
 	ioctl(fd, SOUND_PCM_WRITE_RATE, &rate);
 
-	int fragments = 0x00020002;
+	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);
@@ -232,6 +234,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],
@@ -246,7 +251,8 @@ 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));
@@ -286,8 +292,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);
 }