mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- fixed problem with start_threshold

Browse source 
- fixed rounding problem for period_size (mmap_commit assert invoked)
This commit is contained in:
Jaroslav Kysela 2004-04-03 08:27:58 +00:00
parent 72e2f8046e
commit 033fb96b00
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pcm/pcm_rate.c
View file

@ -631,6 +631,12 @@ static int snd_pcm_rate_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
rate->orig_avail_min = sparams->avail_min; rate->orig_avail_min = sparams->avail_min;
recalc(pcm, &sparams->xfer_align); recalc(pcm, &sparams->xfer_align);
recalc(pcm, &sparams->start_threshold); recalc(pcm, &sparams->start_threshold);
if (sparams->start_threshold <= slave->buffer_size) {
if (sparams->start_threshold > (slave->buffer_size / sparams->avail_min) * sparams->avail_min)
sparams->start_threshold = (slave->buffer_size / sparams->avail_min) * sparams->avail_min;
if (sparams->start_threshold > (slave->buffer_size / sparams->xfer_align) * sparams->xfer_align)
sparams->start_threshold = (slave->buffer_size / sparams->xfer_align) * sparams->xfer_align;
}
if (sparams->stop_threshold >= sparams->boundary) { if (sparams->stop_threshold >= sparams->boundary) {
sparams->stop_threshold = sparams->boundary; sparams->stop_threshold = sparams->boundary;
} else { } else {
@ -1167,7 +1173,7 @@ static snd_pcm_sframes_t snd_pcm_rate_mmap_commit(snd_pcm_t *pcm,
appl_offset = (rate->appl_ptr - xfer) % pcm->buffer_size; appl_offset = (rate->appl_ptr - xfer) % pcm->buffer_size;
xfer = pcm->period_size - xfer; xfer = pcm->period_size - xfer;
if (xfer >= size) { if (xfer >= size) {
if (xfer == size) { if (xfer == size && (snd_pcm_uframes_t)slave_size >= rate->slave->period_size) {
err = snd_pcm_rate_commit_next_period(pcm, appl_offset); err = snd_pcm_rate_commit_next_period(pcm, appl_offset);
if (err < 0) if (err < 0)
return err; return err;
@ -1179,17 +1185,20 @@ static snd_pcm_sframes_t snd_pcm_rate_mmap_commit(snd_pcm_t *pcm,
snd_atomic_write_end(&rate->watom); snd_atomic_write_end(&rate->watom);
return size; return size;
} else { } else {
size -= xfer; if ((snd_pcm_uframes_t)slave_size >= rate->slave->period_size) {
err = snd_pcm_rate_commit_next_period(pcm, appl_offset); err = snd_pcm_rate_commit_next_period(pcm, appl_offset);
if (err < 0) if (err < 0)
return err; return err;
if (err == 0) if (err == 0)
return 0; return 0;
}
snd_atomic_write_begin(&rate->watom); snd_atomic_write_begin(&rate->watom);
snd_pcm_mmap_appl_forward(pcm, xfer); snd_pcm_mmap_appl_forward(pcm, xfer);
snd_atomic_write_end(&rate->watom); snd_atomic_write_end(&rate->watom);
appl_offset += pcm->period_size; appl_offset += pcm->period_size;
appl_offset %= pcm->buffer_size; appl_offset %= pcm->buffer_size;
size -= xfer;
slave_size -= rate->slave->period_size;
} }
while ((snd_pcm_uframes_t)size >= pcm->period_size && while ((snd_pcm_uframes_t)size >= pcm->period_size &&
(snd_pcm_uframes_t)slave_size >= rate->slave->period_size) { (snd_pcm_uframes_t)slave_size >= rate->slave->period_size) {