mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-02-05 04:06:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: add a loop to snd_pcm_avail_delay() to avoid bogus delay values

Browse source 
snd_pcm_avail_delay() is expected to report avail and delay values
in atomic fashion. However the function does two separate syscalls
and it cannot guarantee the avail value is the same as was used
to calculate the delay. This is a problem as the reported delay is
always relative to avail frames value.

If application (like e.g. alsa_conformance_test) uses snd_pcm_avail_delay()
to estimate the effective play position, it can observe bogus delay
values (and effective play position going backwards) if
snd_pcm_avail_delay() is called during a DMA burst where hw_ptr
moves quickly.

This commit adds a loop similar to that used in snd_pcm_hw_htimestamp()
to wait until we get a stable avail reading, and only then extract
the delay. This will avoid bogus values if function is called during
DMA bursts.

Closes: https://github.com/alsa-project/alsa-lib/issues/468
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2025-07-31 15:37:33 +03:00
parent e550dcdd90
commit 206d232877
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/pcm/pcm.c
View file

@ -3107,7 +3107,7 @@ int snd_pcm_avail_delay(snd_pcm_t *pcm,
snd_pcm_sframes_t *delayp)
{
snd_pcm_sframes_t sf;
int err;
int err, ok = 0;
assert(pcm && availp && delayp);
if (CHECK_SANITY(! pcm->setup)) {
@ -3118,15 +3118,25 @@ int snd_pcm_avail_delay(snd_pcm_t *pcm,
err = __snd_pcm_hwsync(pcm);
if (err < 0)
goto unlock;
sf = __snd_pcm_avail_update(pcm);
if (sf < 0) {
err = (int)sf;
goto unlock;
/*
* Delay value is relative to avail, so we have to
* loop to avoid reporting stale delay data.
*/
while (1) {
sf = __snd_pcm_avail_update(pcm);
if (sf < 0) {
err = (int)sf;
goto unlock;
}
if (ok && sf == *availp)
break;
*availp = sf;
err = __snd_pcm_delay(pcm, delayp);
if (err < 0)
goto unlock;
ok = 1;
}
err = __snd_pcm_delay(pcm, delayp);
if (err < 0)
goto unlock;
*availp = sf;
err = 0;
unlock:
snd_pcm_unlock(pcm->fast_op_arg);