mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-07 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pcm: rate - tidy up snd_pcm_rate_avail_update()

Browse source 
No functional change - just move the capture code to
a separate function for the better readability.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-01-03 16:56:38 +01:00
parent 6ca01c07ee
commit 5988bb3ff4
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/pcm/pcm_rate.c
View file

@ -964,29 +964,18 @@ static snd_pcm_sframes_t snd_pcm_rate_mmap_commit(snd_pcm_t *pcm,
return size; return size;
} }
static snd_pcm_sframes_t snd_pcm_rate_avail_update(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_rate_avail_update_capture(snd_pcm_t *pcm,
snd_pcm_sframes_t slave_size)
{ {
snd_pcm_rate_t *rate = pcm->private_data; snd_pcm_rate_t *rate = pcm->private_data;
snd_pcm_t *slave = rate->gen.slave; snd_pcm_t *slave = rate->gen.slave;
snd_pcm_sframes_t slave_size;
slave_size = snd_pcm_avail_update(slave);
if (slave_size < 0)
return slave_size;
if (pcm->stream == SND_PCM_STREAM_CAPTURE)
goto _capture;
snd_pcm_rate_sync_hwptr(pcm);
snd_pcm_rate_sync_playback_area(pcm, rate->appl_ptr);
return snd_pcm_mmap_avail(pcm);
_capture: {
snd_pcm_uframes_t xfer, hw_offset, size; snd_pcm_uframes_t xfer, hw_offset, size;
xfer = snd_pcm_mmap_capture_avail(pcm); xfer = snd_pcm_mmap_capture_avail(pcm);
size = pcm->buffer_size - xfer; size = pcm->buffer_size - xfer;
hw_offset = snd_pcm_mmap_hw_offset(pcm); hw_offset = snd_pcm_mmap_hw_offset(pcm);
while (size >= pcm->period_size && while (size >= pcm->period_size &&
(snd_pcm_uframes_t)slave_size >= rate->gen.slave->period_size) { (snd_pcm_uframes_t)slave_size >= slave->period_size) {
int err = snd_pcm_rate_grab_next_period(pcm, hw_offset); int err = snd_pcm_rate_grab_next_period(pcm, hw_offset);
if (err < 0) if (err < 0)
return err; return err;
@ -994,13 +983,29 @@ static snd_pcm_sframes_t snd_pcm_rate_avail_update(snd_pcm_t *pcm)
return (snd_pcm_sframes_t)xfer; return (snd_pcm_sframes_t)xfer;
xfer += pcm->period_size; xfer += pcm->period_size;
size -= pcm->period_size; size -= pcm->period_size;
slave_size -= rate->gen.slave->period_size; slave_size -= slave->period_size;
hw_offset += pcm->period_size; hw_offset += pcm->period_size;
hw_offset %= pcm->buffer_size; hw_offset %= pcm->buffer_size;
snd_pcm_mmap_hw_forward(pcm, pcm->period_size); snd_pcm_mmap_hw_forward(pcm, pcm->period_size);
} }
return (snd_pcm_sframes_t)xfer; return (snd_pcm_sframes_t)xfer;
} }
static snd_pcm_sframes_t snd_pcm_rate_avail_update(snd_pcm_t *pcm)
{
snd_pcm_rate_t *rate = pcm->private_data;
snd_pcm_sframes_t slave_size;
slave_size = snd_pcm_avail_update(rate->gen.slave);
if (slave_size < 0)
return slave_size;
if (pcm->stream == SND_PCM_STREAM_CAPTURE)
return snd_pcm_rate_avail_update_capture(pcm, slave_size);
snd_pcm_rate_sync_hwptr(pcm);
snd_pcm_rate_sync_playback_area(pcm, rate->appl_ptr);
return snd_pcm_mmap_avail(pcm);
} }
static int snd_pcm_rate_htimestamp(snd_pcm_t *pcm, static int snd_pcm_rate_htimestamp(snd_pcm_t *pcm,