mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: plugin - fix status code for capture

Browse source 
The recent updates do not take in account the possible
calls for the capture stream. Fix the avail and delay
inconsistencies (and assert).

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-01-04 12:32:25 +01:00
parent fc0f7af9ee
commit da5b70d3fa
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/pcm/pcm_plugin.c
View file

@ -545,13 +545,30 @@ static snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
static int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status) static int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
{ {
snd_pcm_plugin_t *plugin = pcm->private_data; snd_pcm_plugin_t *plugin = pcm->private_data;
snd_pcm_sframes_t err; snd_pcm_sframes_t err, diff;
err = snd_pcm_status(plugin->gen.slave, status); err = snd_pcm_status(plugin->gen.slave, status);
if (err < 0) if (err < 0)
return err; return err;
assert(status->appl_ptr == *pcm->appl.ptr);
snd_pcm_plugin_sync_hw_ptr(pcm, status->hw_ptr, status->avail); snd_pcm_plugin_sync_hw_ptr(pcm, status->hw_ptr, status->avail);
/*
* For capture stream, the situation is more complicated, because
* snd_pcm_plugin_avail_update() commits the data to the slave pcm.
* It means that the slave appl_ptr is updated. Calculate diff and
* update the delay and avail.
*
* This resolves the data inconsistency for immediate calls:
* snd_pcm_avail_update()
* snd_pcm_status()
*/
if (pcm->stream == SND_PCM_STREAM_CAPTURE) {
status->appl_ptr = *pcm->appl.ptr;
diff = pcm_frame_diff(status->appl_ptr, *pcm->appl.ptr, pcm->boundary);
status->avail += diff;
status->delay += diff;
} else {
assert(status->appl_ptr == *pcm->appl.ptr);
}
return 0; return 0;
} }