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

alsa: improve elapsed time correction

Browse source 
There is no need to patch the pw_time values with the io->rate just so
we can use it to convert the elapsed time to samples. Use the io->rate
directly instead.
This commit is contained in:
Wim Taymans 2022-09-09 16:34:18 +02:00
parent 41e937e3fd
commit f58021ed45
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -229,7 +229,7 @@ static int snd_pcm_pipewire_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delay
int64_t diff; int64_t diff;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
diff = SPA_TIMESPEC_TO_NSEC(&ts) - pw->time.now; diff = SPA_TIMESPEC_TO_NSEC(&ts) - pw->time.now;
elapsed = (pw->time.rate.denom * diff) / (pw->time.rate.num * SPA_NSEC_PER_SEC); elapsed = (io->rate * diff) / SPA_NSEC_PER_SEC;
} }
if (io->stream == SND_PCM_STREAM_PLAYBACK) if (io->stream == SND_PCM_STREAM_PLAYBACK)
avail = snd_pcm_ioplug_hw_avail(io, pw->hw_ptr, io->appl_ptr); avail = snd_pcm_ioplug_hw_avail(io, pw->hw_ptr, io->appl_ptr);
@ -400,11 +400,8 @@ static void on_stream_process(void *data)
pw_stream_get_time_n(pw->stream, &pw->time, sizeof(pw->time)); pw_stream_get_time_n(pw->stream, &pw->time, sizeof(pw->time));
if (pw->time.rate.num != 0) { if (pw->time.rate.num != 0)
pw->time.delay = pw->time.delay * io->rate * pw->time.rate.num / pw->time.rate.denom; pw->time.delay = pw->time.delay * io->rate * pw->time.rate.num / pw->time.rate.denom;
pw->time.rate.denom = io->rate;
pw->time.rate.num = 1;
}
before = hw_avail = snd_pcm_ioplug_hw_avail(io, pw->hw_ptr, io->appl_ptr); before = hw_avail = snd_pcm_ioplug_hw_avail(io, pw->hw_ptr, io->appl_ptr);