From 0de72e63d7bd180566c71f6fb01d7719525ee326 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Jan 2021 11:17:00 +0100 Subject: [PATCH 43/44] pcm: dmix/dshare - delay calculation fixes and cleanups Unfortunately, we cannot use status->avail from slave, because this value does not wrap to the buffer size and it may even overflow slave boundary (endless run). We can use only hw_ptr from slave. Signed-off-by: Jaroslav Kysela --- src/pcm/pcm_dmix.c | 5 ++--- src/pcm/pcm_dshare.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 5b7472d90c58..be2675aff0f3 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -488,8 +488,7 @@ static int snd_pcm_dmix_status(snd_pcm_t *pcm, snd_pcm_status_t * status) case SNDRV_PCM_STATE_DRAINING: case SNDRV_PCM_STATE_RUNNING: snd_pcm_dmix_sync_ptr0(pcm, status->hw_ptr); - status->delay += snd_pcm_mmap_playback_delay(pcm) - + status->avail - dmix->spcm->buffer_size; + status->delay = snd_pcm_mmap_playback_delay(pcm); break; default: break; @@ -518,7 +517,7 @@ static int snd_pcm_dmix_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp) case SNDRV_PCM_STATE_PREPARED: case SNDRV_PCM_STATE_SUSPENDED: case STATE_RUN_PENDING: - *delayp = snd_pcm_mmap_playback_hw_avail(pcm); + *delayp = snd_pcm_mmap_playback_delay(pcm); return 0; case SNDRV_PCM_STATE_XRUN: return -EPIPE; diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index 8a6725729bc7..10243013714d 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -237,8 +237,7 @@ static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status) case SNDRV_PCM_STATE_DRAINING: case SNDRV_PCM_STATE_RUNNING: snd_pcm_dshare_sync_ptr0(pcm, status->hw_ptr); - status->delay += snd_pcm_mmap_playback_delay(pcm) - + status->avail - dshare->spcm->buffer_size; + status->delay += snd_pcm_mmap_playback_delay(pcm); break; default: break; @@ -290,7 +289,7 @@ static int snd_pcm_dshare_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp) case SNDRV_PCM_STATE_PREPARED: case SNDRV_PCM_STATE_SUSPENDED: case STATE_RUN_PENDING: - *delayp = snd_pcm_mmap_playback_hw_avail(pcm); + *delayp = snd_pcm_mmap_playback_delay(pcm); return 0; case SNDRV_PCM_STATE_XRUN: return -EPIPE; -- 2.26.2