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: dmix - use pcm_frame_diff() in snd_pcm_dmix_sync_ptr0()

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-06-21 09:23:02 +02:00
parent 3f737a2a2c
commit 212c6c18c4
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pcm/pcm_dmix.c
View file

@ -393,17 +393,13 @@ static int snd_pcm_dmix_sync_ptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_ptr
old_slave_hw_ptr = dmix->slave_hw_ptr; old_slave_hw_ptr = dmix->slave_hw_ptr;
dmix->slave_hw_ptr = slave_hw_ptr; dmix->slave_hw_ptr = slave_hw_ptr;
diff = slave_hw_ptr - old_slave_hw_ptr; diff = pcm_frame_diff(slave_hw_ptr, old_slave_hw_ptr, dmix->slave_boundary);
if (diff == 0) /* fast path */ if (diff == 0) /* fast path */
return 0; return 0;
if (dmix->state != SND_PCM_STATE_RUNNING && if (dmix->state != SND_PCM_STATE_RUNNING &&
dmix->state != SND_PCM_STATE_DRAINING) dmix->state != SND_PCM_STATE_DRAINING)
/* not really started yet - don't update hw_ptr */ /* not really started yet - don't update hw_ptr */
return 0; return 0;
if (diff < 0) {
slave_hw_ptr += dmix->slave_boundary;
diff = slave_hw_ptr - old_slave_hw_ptr;
}
dmix->hw_ptr += diff; dmix->hw_ptr += diff;
dmix->hw_ptr %= pcm->boundary; dmix->hw_ptr %= pcm->boundary;
if (pcm->stop_threshold >= pcm->boundary) /* don't care */ if (pcm->stop_threshold >= pcm->boundary) /* don't care */