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 43afea4c815c4b972ceef67fd9f1acb0fb62de09..aabc67e543fdfade00bc018f86d2cdd837b5d266 100644 (file)
--- 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) {