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

rate plugin: wait for data to be drained

Browse source 
When draining, wait for the slave device to become ready to prevent
committing more data than would have been available in the buffer.
This commit is contained in:
Clemens Ladisch 2006-03-13 10:41:54 +00:00
parent aaaf843871
commit e58f4d966f
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/pcm/pcm_rate.c
View file

@ -1297,11 +1297,22 @@ static int snd_pcm_rate_drain(snd_pcm_t *pcm)
if (pcm->stream == SND_PCM_STREAM_PLAYBACK) {
/* commit the remaining fraction (if any) */
snd_pcm_uframes_t size, ofs;
snd_pcm_uframes_t size, ofs, saved_avail_min;
snd_pcm_sw_params_t sw_params;
/* temporarily set avail_min to one period */
sw_params = rate->sw_params;
saved_avail_min = sw_params.avail_min;
sw_params.avail_min = rate->gen.slave->period_size;
snd_pcm_sw_params(rate->gen.slave, &sw_params);
size = rate->appl_ptr - rate->last_commit_ptr;
ofs = rate->last_commit_ptr % pcm->buffer_size;
while (size > 0) {
snd_pcm_uframes_t psize, spsize;
if (snd_pcm_wait(rate->gen.slave, -1) < 0)
break;
if (size > pcm->period_size) {
psize = pcm->period_size;
spsize = rate->gen.slave->period_size;
@ -1316,6 +1327,8 @@ static int snd_pcm_rate_drain(snd_pcm_t *pcm)
ofs = (ofs + psize) % pcm->buffer_size;
size -= psize;
}
sw_params.avail_min = saved_avail_min;
snd_pcm_sw_params(rate->gen.slave, &sw_params);
}
return snd_pcm_drain(rate->gen.slave);
}