mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-plugin: use hw_avail in _delay for playback

Browse source 
for playback streams we want to include the hw_avail, which is the amount of
data that the hardware can read or the amount of data the application has
written.

This is in contrast to using _avail for the capture stream, which is
what the application can read. hw_avail for a capture stream is how many
samples the hardware can write or the amount of free space.

See #1697
This commit is contained in:
Wim Taymans 2021-11-24 13:09:24 +01:00
parent 743cced63e
commit 955dde5272
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -223,7 +223,11 @@ static int snd_pcm_pipewire_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delay
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 = (pw->time.rate.denom * diff) / (pw->time.rate.num * SPA_NSEC_PER_SEC);
} }
avail = snd_pcm_ioplug_avail(io, pw->hw_ptr, io->appl_ptr); if (io->stream == SND_PCM_STREAM_PLAYBACK)
avail = snd_pcm_ioplug_hw_avail(io, pw->hw_ptr, io->appl_ptr);
else
avail = snd_pcm_ioplug_avail(io, pw->hw_ptr, io->appl_ptr);
filled = pw->time.delay + avail; filled = pw->time.delay + avail;
if (io->stream == SND_PCM_STREAM_PLAYBACK) if (io->stream == SND_PCM_STREAM_PLAYBACK)
@ -231,8 +235,8 @@ static int snd_pcm_pipewire_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delay
else else
*delayp = filled + elapsed; *delayp = filled + elapsed;
pw_log_trace("avail:%"PRIi64" filled %"PRIi64" elapsed:%"PRIi64" delay:%ld", pw_log_trace("avail:%"PRIi64" filled %"PRIi64" elapsed:%"PRIi64" delay:%ld %lu %lu",
avail, filled, elapsed, *delayp); avail, filled, elapsed, *delayp, pw->hw_ptr, io->appl_ptr);
return 0; return 0;
} }