From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 23 Sep 2016 17:36:51 +0000 (+0200)
Subject: Do not use the timing of dropped frames as part of the video master clock.
X-Git-Tag: 1.4.0~41
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7188db27a931607ed0388b10b351164c37cf04ee;p=nageru

Do not use the timing of dropped frames as part of the video master clock.

Hopefully improves resampling somewhat when we are dropping frames;
it is tricky to deal with such an uneven master clock, though.
---

diff --git a/mixer.cpp b/mixer.cpp
index 43afea4..aabc67e 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -857,7 +857,10 @@ void Mixer::audio_thread_func()
 
 		ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy =
 			task.adjust_rate ? ResamplingQueue::ADJUST_RATE : ResamplingQueue::DO_NOT_ADJUST_RATE;
-		vector<float> samples_out = audio_mixer.get_output(double(task.pts_int) / TIMEBASE, task.num_samples, rate_adjustment_policy);
+		vector<float> samples_out = audio_mixer.get_output(
+			double(task.pts_int) / TIMEBASE,
+			task.num_samples,
+			rate_adjustment_policy);
 
 		// Send the samples to the sound card, then add them to the output.
 		if (alsa) {