From 9a43dc15b2979ed6d8850b033b594fbef829c991 Mon Sep 17 00:00:00 2001 From: "Alexander E. Patrakov" Date: Sun, 14 Sep 2014 00:30:14 +0600 Subject: [PATCH] pcm: express the rewind size limitation logic better There are a few places where the argument of the .rewind or .forward callback is checked against the same value as returned by .rewindable or .forwardable. Express this "don't rewind more than rewindable" logic explicitly, so that the future fixes to the rewindable size can go to one function instead of two. While at it, take advantage of the fact that snd_pcm_mmap_avail() cannot return negative values (except due to integer overflow, which is AFAICS impossible given the current boundary choice). Signed-off-by: Alexander E. Patrakov Signed-off-by: Jaroslav Kysela --- src/pcm/pcm_dmix.c | 4 +--- src/pcm/pcm_dshare.c | 6 ++---- src/pcm/pcm_dsnoop.c | 6 ++---- src/pcm/pcm_plugin.c | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 73cbe3f8..ffde12a1 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -751,9 +751,7 @@ static snd_pcm_sframes_t snd_pcm_dmix_forward(snd_pcm_t *pcm, snd_pcm_uframes_t { snd_pcm_sframes_t avail; - avail = snd_pcm_mmap_playback_avail(pcm); - if (avail < 0) - return 0; + avail = snd_pcm_dmix_forwardable(pcm); if (frames > (snd_pcm_uframes_t)avail) frames = avail; snd_pcm_mmap_appl_forward(pcm, frames); diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index b9851728..f1a1a1d7 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -419,7 +419,7 @@ static snd_pcm_sframes_t snd_pcm_dshare_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t { snd_pcm_sframes_t avail; - avail = snd_pcm_mmap_playback_hw_avail(pcm); + avail = snd_pcm_dshare_rewindable(pcm); if (avail < 0) return 0; if (frames > (snd_pcm_uframes_t)avail) @@ -437,9 +437,7 @@ static snd_pcm_sframes_t snd_pcm_dshare_forward(snd_pcm_t *pcm, snd_pcm_uframes_ { snd_pcm_sframes_t avail; - avail = snd_pcm_mmap_playback_avail(pcm); - if (avail < 0) - return 0; + avail = snd_pcm_dshare_forwardable(pcm); if (frames > (snd_pcm_uframes_t)avail) frames = avail; snd_pcm_mmap_appl_forward(pcm, frames); diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 0f9c9df4..e56e4022 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -342,9 +342,7 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t { snd_pcm_sframes_t avail; - avail = snd_pcm_mmap_capture_avail(pcm); - if (avail < 0) - return 0; + avail = snd_pcm_dsnoop_rewindable(pcm); if (frames > (snd_pcm_uframes_t)avail) frames = avail; snd_pcm_mmap_appl_backward(pcm, frames); @@ -360,7 +358,7 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_forward(snd_pcm_t *pcm, snd_pcm_uframes_ { snd_pcm_sframes_t avail; - avail = snd_pcm_mmap_capture_hw_avail(pcm); + avail = snd_pcm_dsnoop_forwardable(pcm); if (avail < 0) return 0; if (frames > (snd_pcm_uframes_t)avail) diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index 4ddf10c1..a607ccfe 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c @@ -204,7 +204,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_rewindable(snd_pcm_t *pcm) snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames) { snd_pcm_plugin_t *plugin = pcm->private_data; - snd_pcm_sframes_t n = snd_pcm_mmap_hw_avail(pcm); + snd_pcm_sframes_t n = snd_pcm_plugin_rewindable(pcm); snd_pcm_sframes_t sframes; if ((snd_pcm_uframes_t)n < frames) @@ -232,7 +232,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_forwardable(snd_pcm_t *pcm) snd_pcm_sframes_t snd_pcm_plugin_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frames) { snd_pcm_plugin_t *plugin = pcm->private_data; - snd_pcm_sframes_t n = snd_pcm_mmap_avail(pcm); + snd_pcm_sframes_t n = snd_pcm_plugin_forwardable(pcm); snd_pcm_sframes_t sframes; if ((snd_pcm_uframes_t)n < frames) -- 2.47.3