diff options
| author | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-01-11 23:58:25 +0530 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-01 10:38:27 +0000 |
| commit | 67d188894c7e74fe78e14db566a11cfe2d500114 (patch) | |
| tree | 357395ffd0401419fb01cfdd338e0c3892d1f64d /src | |
| parent | 6b280e97e317ecf5250b935522392e71f6642ab3 (diff) | |
client: Don't update smoother while corked
This prevents the smoother attached to the stream clock from being
updated while the stream is corked, which in turn ensures that once
corking is completed, pa_stream_get_time() always returns the same value
until the stream is uncorked - i.e., the clock does not advance when the
client believes that it will not.
The actual call to pa_smoother_put() happens on things like stream
suspend/unsuspend, which trigger timing updates. This changes the
smoother coefficients, which means that a call to pa_smoother_get() for
the same value of 'x' can return different values before and after a
timing update.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pulse/stream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulse/stream.c b/src/pulse/stream.c index 8da40eca..f825ed9b 100644 --- a/src/pulse/stream.c +++ b/src/pulse/stream.c @@ -1717,8 +1717,8 @@ static void stream_get_timing_info_callback(pa_pdispatch *pd, uint32_t command, i->read_index -= (int64_t) pa_memblockq_get_length(o->stream->record_memblockq); } - /* Update smoother */ - if (o->stream->smoother) { + /* Update smoother if we're not corked */ + if (o->stream->smoother && !o->stream->corked) { pa_usec_t u, x; u = x = pa_rtclock_now() - i->transport_usec; |