diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2004-04-03 08:27:58 +0000 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2004-04-03 08:27:58 +0000 |
| commit | 033fb96b00a894d7617ab55b8cf09c4fb9abffaf (patch) | |
| tree | ba00a8491df1a1af4cea28259a6cbc9ee86f0551 | |
| parent | 72e2f8046ef116d2917581717e545cdb07c562dc (diff) | |
| download | alsa-lib-033fb96b00a894d7617ab55b8cf09c4fb9abffaf.tar.gz | |
- fixed problem with start_threshold
- fixed rounding problem for period_size (mmap_commit assert invoked)
| -rw-r--r-- | src/pcm/pcm_rate.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 2c0e4c5e..9ba28e25 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -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; recalc(pcm, &sparams->xfer_align); 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) { sparams->stop_threshold = sparams->boundary; } 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; xfer = pcm->period_size - xfer; 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); if (err < 0) 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); return size; } else { - size -= xfer; - err = snd_pcm_rate_commit_next_period(pcm, appl_offset); - if (err < 0) - return err; - if (err == 0) - return 0; + if ((snd_pcm_uframes_t)slave_size >= rate->slave->period_size) { + err = snd_pcm_rate_commit_next_period(pcm, appl_offset); + if (err < 0) + return err; + if (err == 0) + return 0; + } snd_atomic_write_begin(&rate->watom); snd_pcm_mmap_appl_forward(pcm, xfer); snd_atomic_write_end(&rate->watom); appl_offset += pcm->period_size; appl_offset %= pcm->buffer_size; + size -= xfer; + slave_size -= rate->slave->period_size; } while ((snd_pcm_uframes_t)size >= pcm->period_size && (snd_pcm_uframes_t)slave_size >= rate->slave->period_size) { |