mirror of
https://gitlab.freedesktop.org/pipewire/pipewire
synced 2024-09-06 16:56:00 +00:00
alsa-plugin: use hw_avail in _delay for playback
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:
parent
743cced63e
commit
955dde5272
|
@ -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;
|
||||
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;
|
||||
|
||||
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
|
||||
*delayp = filled + elapsed;
|
||||
|
||||
pw_log_trace("avail:%"PRIi64" filled %"PRIi64" elapsed:%"PRIi64" delay:%ld",
|
||||
avail, filled, elapsed, *delayp);
|
||||
pw_log_trace("avail:%"PRIi64" filled %"PRIi64" elapsed:%"PRIi64" delay:%ld %lu %lu",
|
||||
avail, filled, elapsed, *delayp, pw->hw_ptr, io->appl_ptr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue