mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream: guard against old timestamps

Browse source
This commit is contained in:
Wim Taymans 2020-08-19 16:02:52 +02:00
parent 825fe8ac54
commit 1f298cb5bf
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pipewire-pulseaudio/src/stream.c
View file

@ -1243,7 +1243,7 @@ SPA_EXPORT
size_t pa_stream_writable_size(PA_CONST pa_stream *s) size_t pa_stream_writable_size(PA_CONST pa_stream *s)
{ {
const pa_timing_info *i; const pa_timing_info *i;
uint64_t now, queued, writable, elapsed; uint64_t now, then, queued, writable, elapsed;
struct timespec ts; struct timespec ts;
spa_assert(s); spa_assert(s);
@ -1259,7 +1259,8 @@ size_t pa_stream_writable_size(PA_CONST pa_stream *s)
if (s->have_time) { if (s->have_time) {
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
now = SPA_TIMESPEC_TO_USEC(&ts); now = SPA_TIMESPEC_TO_USEC(&ts);
elapsed = pa_usec_to_bytes(now - SPA_TIMEVAL_TO_USEC(&i->timestamp), &s->sample_spec); then = SPA_TIMEVAL_TO_USEC(&i->timestamp);
elapsed = now > then ? pa_usec_to_bytes(now - then, &s->sample_spec) : 0;
} else { } else {
elapsed = 0; elapsed = 0;
} }
@ -1648,7 +1649,7 @@ SPA_EXPORT
int pa_stream_get_time(pa_stream *s, pa_usec_t *r_usec) int pa_stream_get_time(pa_stream *s, pa_usec_t *r_usec)
{ {
struct timespec ts; struct timespec ts;
uint64_t now, res; uint64_t now, then, res;
pa_timing_info *i; pa_timing_info *i;
spa_assert(s); spa_assert(s);
@ -1672,8 +1673,9 @@ int pa_stream_get_time(pa_stream *s, pa_usec_t *r_usec)
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
now = SPA_TIMESPEC_TO_USEC(&ts); now = SPA_TIMESPEC_TO_USEC(&ts);
if (s->have_time) then = SPA_TIMEVAL_TO_USEC(&i->timestamp);
res += now - SPA_TIMEVAL_TO_USEC(&i->timestamp); if (s->have_time && now > then)
res += now - then;
if (r_usec) if (r_usec)
*r_usec = res; *r_usec = res;