mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-09 05:33:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: rate - use pcm_frame_diff() on related places

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-01-04 17:14:42 +01:00
parent da5b70d3fa
commit ac520b2ed1
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pcm/pcm_rate.c
View file

@ -561,17 +561,16 @@ snd_pcm_rate_read_areas1(snd_pcm_t *pcm,
static inline void snd_pcm_rate_sync_hwptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_ptr) static inline void snd_pcm_rate_sync_hwptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_ptr)
{ {
snd_pcm_rate_t *rate = pcm->private_data; snd_pcm_rate_t *rate;
snd_pcm_sframes_t slave_hw_ptr_diff;
snd_pcm_sframes_t slave_hw_ptr_diff = slave_hw_ptr - rate->last_slave_hw_ptr;
snd_pcm_sframes_t last_slave_hw_ptr_frac; snd_pcm_sframes_t last_slave_hw_ptr_frac;
if (pcm->stream != SND_PCM_STREAM_PLAYBACK) if (pcm->stream != SND_PCM_STREAM_PLAYBACK)
return; return;
if (slave_hw_ptr_diff < 0) rate = pcm->private_data;
slave_hw_ptr_diff += rate->gen.slave->boundary; /* slave boundary wraparound */ slave_hw_ptr_diff = pcm_frame_diff(slave_hw_ptr, rate->last_slave_hw_ptr, rate->gen.slave->boundary);
else if (slave_hw_ptr_diff == 0) if (slave_hw_ptr_diff == 0)
return; return;
last_slave_hw_ptr_frac = rate->last_slave_hw_ptr % rate->gen.slave->period_size; last_slave_hw_ptr_frac = rate->last_slave_hw_ptr % rate->gen.slave->period_size;
/* While handling fraction part fo slave period, rounded value will be /* While handling fraction part fo slave period, rounded value will be
@ -922,10 +921,7 @@ static int snd_pcm_rate_sync_playback_area(snd_pcm_t *pcm, snd_pcm_uframes_t app
if (slave_size < 0) if (slave_size < 0)
return slave_size; return slave_size;
if (appl_ptr < rate->last_commit_ptr) xfer = pcm_frame_diff(appl_ptr, rate->last_commit_ptr, pcm->boundary);
xfer = appl_ptr - rate->last_commit_ptr + pcm->boundary;
else
xfer = appl_ptr - rate->last_commit_ptr;
while (xfer >= pcm->period_size && while (xfer >= pcm->period_size &&
(snd_pcm_uframes_t)slave_size >= rate->gen.slave->period_size) { (snd_pcm_uframes_t)slave_size >= rate->gen.slave->period_size) {
err = snd_pcm_rate_commit_next_period(pcm, rate->last_commit_ptr % pcm->buffer_size); err = snd_pcm_rate_commit_next_period(pcm, rate->last_commit_ptr % pcm->buffer_size);
@ -1059,9 +1055,7 @@ static int snd_pcm_rate_drain(snd_pcm_t *pcm)
sw_params.avail_min = 1; sw_params.avail_min = 1;
snd_pcm_sw_params(rate->gen.slave, &sw_params); snd_pcm_sw_params(rate->gen.slave, &sw_params);
size = rate->appl_ptr - rate->last_commit_ptr; size = pcm_frame_diff(rate->appl_ptr, rate->last_commit_ptr, pcm->boundary);
if (size > pcm->boundary)
size -= pcm->boundary;
ofs = rate->last_commit_ptr % pcm->buffer_size; ofs = rate->last_commit_ptr % pcm->buffer_size;
while (size > 0) { while (size > 0) {
snd_pcm_uframes_t psize, spsize; snd_pcm_uframes_t psize, spsize;