X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fpi_controller.cc;h=2ecfe730d8cd117cffa2737d0aada32750dcd8f1;hb=1b8e8303b25b6b013367741f2b47be3585b22cb3;hp=baee5a972a31414f54ffb2ca78a0bd34ebcf993c;hpb=f938687f8798d094c99cd4308ad6aa1c467e4a97;p=ardour.git

diff --git a/libs/ardour/pi_controller.cc b/libs/ardour/pi_controller.cc
index baee5a972a..2ecfe730d8 100644
--- a/libs/ardour/pi_controller.cc
+++ b/libs/ardour/pi_controller.cc
@@ -56,10 +56,11 @@ PIController::~PIController ()
 }
 
 double
-PIController::get_ratio (int fill_level)
+PIController::get_ratio (int fill_level, int period_size)
 {
 	double offset = fill_level;
 	double this_catch_factor = catch_factor;
+	double this_catch_factor2 = catch_factor2 * 4096.0/(double)period_size;
 
 	
 	// Save offset.
@@ -96,7 +97,7 @@ PIController::get_ratio (int fill_level)
 	// u(t) = K * (e(t) + 1/T \int e(t') dt')
 	// Kp = 1/catch_factor and T = catch_factor2  Ki = Kp/T 
 	current_resample_factor 
-                = static_resample_factor - smooth_offset / this_catch_factor - offset_integral / this_catch_factor / catch_factor2;
+                = static_resample_factor - smooth_offset / this_catch_factor - offset_integral / this_catch_factor / this_catch_factor2;
 	
 	// Now quantize this value around resample_mean, so that the noise which is in the integral component doesnt hurt.
 	current_resample_factor = floor((current_resample_factor - resample_mean) * controlquant + 0.5) / controlquant + resample_mean;
@@ -151,15 +152,15 @@ PIChaser::~PIChaser() {
 }
 
 double
-PIChaser::get_ratio(nframes64_t chasetime_measured, nframes64_t chasetime, nframes64_t slavetime_measured, nframes64_t slavetime, bool in_control ) {
+PIChaser::get_ratio(framepos_t chasetime_measured, framepos_t chasetime, framepos_t slavetime_measured, framepos_t slavetime, bool in_control, int period_size ) {
 
 	feed_estimator( chasetime_measured, chasetime );
 	std::cerr << (double)chasetime_measured/48000.0 << " " << chasetime << " " << slavetime << " ";
 	double crude = get_estimate();
 	double fine;  
-	nframes64_t massaged_chasetime = chasetime + (nframes64_t)( (double)(slavetime_measured - chasetime_measured) * crude );
+	framepos_t massaged_chasetime = chasetime + (framepos_t)( (double)(slavetime_measured - chasetime_measured) * crude );
 
-	fine = pic->get_ratio( slavetime - massaged_chasetime );
+	fine = pic->get_ratio (slavetime - massaged_chasetime, period_size);
 	if (in_control) {
 	    if (fabs(fine-crude) > crude*speed_threshold) {
 		std::cout << "reset to " << crude << " fine = " << fine << "\n";
@@ -187,7 +188,7 @@ PIChaser::get_ratio(nframes64_t chasetime_measured, nframes64_t chasetime, nfram
 }
 
 void
-PIChaser::feed_estimator( nframes64_t realtime, nframes64_t chasetime ) {
+PIChaser::feed_estimator (framepos_t realtime, framepos_t chasetime ) {
 	array_index += 1;
 	realtime_stamps [ array_index%ESTIMATOR_SIZE ] = realtime;
 	chasetime_stamps[ array_index%ESTIMATOR_SIZE ] = chasetime;
@@ -198,8 +199,8 @@ PIChaser::get_estimate() {
 	double est = 0;
 	int num=0;
 	int i;
-	nframes64_t n1_realtime;
-	nframes64_t n1_chasetime;
+	framepos_t n1_realtime;
+	framepos_t n1_chasetime;
 	for( i=(array_index + 1); i<=(array_index + ESTIMATOR_SIZE); i++ ) {
 	    if( realtime_stamps[(i)%ESTIMATOR_SIZE] ) {
 		n1_realtime = realtime_stamps[(i)%ESTIMATOR_SIZE];
@@ -212,8 +213,8 @@ PIChaser::get_estimate() {
 	for( ; i<=(array_index + ESTIMATOR_SIZE); i++ ) {
 	    if( realtime_stamps[(i)%ESTIMATOR_SIZE] ) {
 		if( (realtime_stamps[(i)%ESTIMATOR_SIZE] - n1_realtime) > 200 ) {
-		    nframes64_t n_realtime = realtime_stamps[(i)%ESTIMATOR_SIZE];
-		    nframes64_t n_chasetime = chasetime_stamps[(i)%ESTIMATOR_SIZE];
+		    framepos_t n_realtime = realtime_stamps[(i)%ESTIMATOR_SIZE];
+		    framepos_t n_chasetime = chasetime_stamps[(i)%ESTIMATOR_SIZE];
 		    est += ((double)( n_chasetime - n1_chasetime ))
 			  / ((double)( n_realtime - n1_realtime ));
 		    n1_realtime = n_realtime;