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

Remove ugly hack in rate plugin poll_descriptors callback

Browse source 
The rate plugin has ugly hacks in poll_descriptors callback to adjust
avail_min when partial read/write occurs.  This causes often unexpected
problems like XRUNs, especially with two-period cases.

Let's remove that beast, it's rather harmful than useful.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
This commit is contained in:
Stas Sergeev 2007-11-12 12:01:16 +01:00 • committed by Takashi Iwai
parent 7b51f62732
commit c13b8dc986
1 changed files with 1 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/pcm/pcm_rate.c
View file

@ -715,38 +715,6 @@ static snd_pcm_sframes_t snd_pcm_rate_forward(snd_pcm_t *pcm, snd_pcm_uframes_t
return n;
}
static int snd_pcm_rate_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space)
{
snd_pcm_rate_t *rate = pcm->private_data;
snd_pcm_uframes_t avail_min;
int ret, err;
ret = snd_pcm_generic_poll_descriptors(pcm, pfds, space);
if (ret < 0)
return ret;
avail_min = rate->appl_ptr % pcm->period_size;
if (avail_min > 0) {
recalc(pcm, &avail_min);
if (avail_min < rate->gen.slave->buffer_size &&
avail_min != rate->gen.slave->period_size)
avail_min++; /* 1st small little rounding correction */
if (avail_min < rate->gen.slave->buffer_size &&
avail_min != rate->gen.slave->period_size)
avail_min++; /* 2nd small little rounding correction */
avail_min += rate->orig_avail_min;
} else {
avail_min = rate->orig_avail_min;
}
if (rate->sw_params.avail_min == avail_min)
return ret;
rate->sw_params.avail_min = avail_min;
err = snd_pcm_sw_params(rate->gen.slave, &rate->sw_params);
if (err < 0)
return err;
return ret;
}
static int snd_pcm_rate_commit_area(snd_pcm_t *pcm, snd_pcm_rate_t *rate,
snd_pcm_uframes_t appl_offset,
snd_pcm_uframes_t size,
@ -1229,7 +1197,7 @@ static snd_pcm_fast_ops_t snd_pcm_rate_fast_ops = {
.avail_update = snd_pcm_rate_avail_update,
.mmap_commit = snd_pcm_rate_mmap_commit,
.poll_descriptors_count = snd_pcm_generic_poll_descriptors_count,
.poll_descriptors = snd_pcm_rate_poll_descriptors,
.poll_descriptors = snd_pcm_generic_poll_descriptors,
.poll_revents = snd_pcm_rate_poll_revents,
};