mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-15 08:56:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: only calculate elapsed time when known

Browse source
This commit is contained in:
Wim Taymans 2022-09-09 18:11:23 +02:00
parent 5fb361724c
commit ca228003c4
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pipewire-alsa/alsa-plugins/pcm_pipewire.c
View file

@ -234,7 +234,7 @@ static int snd_pcm_pipewire_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delay
{ {
snd_pcm_pipewire_t *pw = io->private_data; snd_pcm_pipewire_t *pw = io->private_data;
uintptr_t seq1, seq2; uintptr_t seq1, seq2;
int64_t elapsed, delay, now, avail; int64_t elapsed = 0, delay, now, avail;
struct timespec ts; struct timespec ts;
int64_t diff; int64_t diff;
@ -251,14 +251,16 @@ static int snd_pcm_pipewire_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delay
seq2 = SEQ_READ(pw->seq); seq2 = SEQ_READ(pw->seq);
} while (!SEQ_READ_SUCCESS(seq1, seq2)); } while (!SEQ_READ_SUCCESS(seq1, seq2));
clock_gettime(CLOCK_MONOTONIC, &ts); if (now != 0) {
diff = SPA_TIMESPEC_TO_NSEC(&ts) - now; clock_gettime(CLOCK_MONOTONIC, &ts);
elapsed = (io->rate * diff) / SPA_NSEC_PER_SEC; diff = SPA_TIMESPEC_TO_NSEC(&ts) - now;
elapsed = (io->rate * diff) / SPA_NSEC_PER_SEC;
if (io->stream == SND_PCM_STREAM_PLAYBACK) if (io->stream == SND_PCM_STREAM_PLAYBACK)
delay -= SPA_MIN(elapsed, delay); delay -= SPA_MIN(elapsed, delay);
else else
delay += SPA_MIN(elapsed, (int64_t)io->buffer_size); delay += SPA_MIN(elapsed, (int64_t)io->buffer_size);
}
*delayp = delay + avail; *delayp = delay + avail;
@ -586,6 +588,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io)
done: done:
pw->hw_ptr = 0; pw->hw_ptr = 0;
pw->now = 0;
pw->xrun_detected = false; pw->xrun_detected = false;
pw->drained = false; pw->drained = false;
pw->draining = false; pw->draining = false;