Skip to content

L
linux
Commit 763e5067 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: pcm: Clean up with snd_pcm_avail() and snd_pcm_hw_avail() helpers 

Introduce two new direction-neutral helpers to calculate the avail and
hw_avail values, and clean up the code with them.

The two separated forward and rewind functions are gathered to the
unified functions.

No functional change but only code reductions.
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 057666b6
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 75 deletions
sound/core/pcm_compat.c
View file @ 763e5067
...@@ -44,10 +44,7 @@ static int snd_pcm_ioctl_rewind_compat(struct snd_pcm_substream *substream, ...@@ -44,10 +44,7 @@ static int snd_pcm_ioctl_rewind_compat(struct snd_pcm_substream *substream,
if (get_user(frames, src)) if (get_user(frames, src))
return -EFAULT; return -EFAULT;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) err = snd_pcm_rewind(substream, frames);
err = snd_pcm_playback_rewind(substream, frames);
else
err = snd_pcm_capture_rewind(substream, frames);
if (put_user(err, src)) if (put_user(err, src))
return -EFAULT; return -EFAULT;
return err < 0 ? err : 0; return err < 0 ? err : 0;
...@@ -61,10 +58,7 @@ static int snd_pcm_ioctl_forward_compat(struct snd_pcm_substream *substream, ...@@ -61,10 +58,7 @@ static int snd_pcm_ioctl_forward_compat(struct snd_pcm_substream *substream,
if (get_user(frames, src)) if (get_user(frames, src))
return -EFAULT; return -EFAULT;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) err = snd_pcm_forward(substream, frames);
err = snd_pcm_playback_forward(substream, frames);
else
err = snd_pcm_capture_forward(substream, frames);
if (put_user(err, src)) if (put_user(err, src))
return -EFAULT; return -EFAULT;
return err < 0 ? err : 0; return err < 0 ? err : 0;
......
sound/core/pcm_lib.c
View file @ 763e5067
...@@ -191,10 +191,7 @@ int snd_pcm_update_state(struct snd_pcm_substream *substream, ...@@ -191,10 +191,7 @@ int snd_pcm_update_state(struct snd_pcm_substream *substream,
{ {
snd_pcm_uframes_t avail; snd_pcm_uframes_t avail;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) avail = snd_pcm_avail(substream);
avail = snd_pcm_playback_avail(runtime);
else
avail = snd_pcm_capture_avail(runtime);
if (avail > runtime->avail_max) if (avail > runtime->avail_max)
runtime->avail_max = avail; runtime->avail_max = avail;
if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) { if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
...@@ -1856,10 +1853,7 @@ static int wait_for_avail(struct snd_pcm_substream *substream, ...@@ -1856,10 +1853,7 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
* This check must happen after been added to the waitqueue * This check must happen after been added to the waitqueue
* and having current state be INTERRUPTIBLE. * and having current state be INTERRUPTIBLE.
*/ */
if (is_playback) avail = snd_pcm_avail(substream);
avail = snd_pcm_playback_avail(runtime);
else
avail = snd_pcm_capture_avail(runtime);
if (avail >= runtime->twake) if (avail >= runtime->twake)
break; break;
snd_pcm_stream_unlock_irq(substream); snd_pcm_stream_unlock_irq(substream);
...@@ -2175,10 +2169,7 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, ...@@ -2175,10 +2169,7 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,
runtime->twake = runtime->control->avail_min ? : 1; runtime->twake = runtime->control->avail_min ? : 1;
if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
snd_pcm_update_hw_ptr(substream); snd_pcm_update_hw_ptr(substream);
if (is_playback) avail = snd_pcm_avail(substream);
avail = snd_pcm_playback_avail(runtime);
else
avail = snd_pcm_capture_avail(runtime);
while (size > 0) { while (size > 0) {
snd_pcm_uframes_t frames, appl_ptr, appl_ofs; snd_pcm_uframes_t frames, appl_ptr, appl_ofs;
snd_pcm_uframes_t cont; snd_pcm_uframes_t cont;
......
sound/core/pcm_local.h
View file @ 763e5067
...@@ -36,6 +36,24 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream); ...@@ -36,6 +36,24 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream);
void snd_pcm_playback_silence(struct snd_pcm_substream *substream, void snd_pcm_playback_silence(struct snd_pcm_substream *substream,
snd_pcm_uframes_t new_hw_ptr); snd_pcm_uframes_t new_hw_ptr);
static inline snd_pcm_uframes_t
snd_pcm_avail(struct snd_pcm_substream *substream)
{
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
return snd_pcm_playback_avail(substream->runtime);
else
return snd_pcm_capture_avail(substream->runtime);
}
static inline snd_pcm_uframes_t
snd_pcm_hw_avail(struct snd_pcm_substream *substream)
{
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
return snd_pcm_playback_hw_avail(substream->runtime);
else
return snd_pcm_capture_hw_avail(substream->runtime);
}
#ifdef CONFIG_SND_PCM_TIMER #ifdef CONFIG_SND_PCM_TIMER
void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream); void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream);
void snd_pcm_timer_init(struct snd_pcm_substream *substream); void snd_pcm_timer_init(struct snd_pcm_substream *substream);
......
sound/core/pcm_native.c
View file @ 763e5067
...@@ -908,8 +908,8 @@ int snd_pcm_status(struct snd_pcm_substream *substream, ...@@ -908,8 +908,8 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
_tstamp_end: _tstamp_end:
status->appl_ptr = runtime->control->appl_ptr; status->appl_ptr = runtime->control->appl_ptr;
status->hw_ptr = runtime->status->hw_ptr; status->hw_ptr = runtime->status->hw_ptr;
status->avail = snd_pcm_avail(substream);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
status->avail = snd_pcm_playback_avail(runtime);
if (runtime->status->state == SNDRV_PCM_STATE_RUNNING || if (runtime->status->state == SNDRV_PCM_STATE_RUNNING ||
runtime->status->state == SNDRV_PCM_STATE_DRAINING) { runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
status->delay = runtime->buffer_size - status->avail; status->delay = runtime->buffer_size - status->avail;
...@@ -917,7 +917,6 @@ int snd_pcm_status(struct snd_pcm_substream *substream, ...@@ -917,7 +917,6 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
} else } else
status->delay = 0; status->delay = 0;
} else { } else {
status->avail = snd_pcm_capture_avail(runtime);
if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
status->delay = status->avail + runtime->delay; status->delay = status->avail + runtime->delay;
else else
...@@ -2610,28 +2609,9 @@ static snd_pcm_sframes_t rewind_appl_ptr(struct snd_pcm_substream *substream, ...@@ -2610,28 +2609,9 @@ static snd_pcm_sframes_t rewind_appl_ptr(struct snd_pcm_substream *substream,
return ret < 0 ? 0 : frames; return ret < 0 ? 0 : frames;
} }
static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *substream, static snd_pcm_sframes_t snd_pcm_rewind(struct snd_pcm_substream *substream,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_sframes_t ret;
if (frames == 0)
return 0;
snd_pcm_stream_lock_irq(substream);
ret = do_pcm_hwsync(substream);
if (!ret)
ret = rewind_appl_ptr(substream, frames,
snd_pcm_playback_hw_avail(runtime));
snd_pcm_stream_unlock_irq(substream);
return ret;
}
static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substream,
snd_pcm_uframes_t frames)
{
struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_sframes_t ret; snd_pcm_sframes_t ret;
if (frames == 0) if (frames == 0)
...@@ -2641,33 +2621,14 @@ static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substr ...@@ -2641,33 +2621,14 @@ static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substr
ret = do_pcm_hwsync(substream); ret = do_pcm_hwsync(substream);
if (!ret) if (!ret)
ret = rewind_appl_ptr(substream, frames, ret = rewind_appl_ptr(substream, frames,
snd_pcm_capture_hw_avail(runtime)); snd_pcm_hw_avail(substream));
snd_pcm_stream_unlock_irq(substream);
return ret;
}
static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *substream,
snd_pcm_uframes_t frames)
{
struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_sframes_t ret;
if (frames == 0)
return 0;
snd_pcm_stream_lock_irq(substream);
ret = do_pcm_hwsync(substream);
if (!ret)
ret = forward_appl_ptr(substream, frames,
snd_pcm_playback_avail(runtime));
snd_pcm_stream_unlock_irq(substream); snd_pcm_stream_unlock_irq(substream);
return ret; return ret;
} }
static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *substream, static snd_pcm_sframes_t snd_pcm_forward(struct snd_pcm_substream *substream,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_sframes_t ret; snd_pcm_sframes_t ret;
if (frames == 0) if (frames == 0)
...@@ -2677,7 +2638,7 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst ...@@ -2677,7 +2638,7 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst
ret = do_pcm_hwsync(substream); ret = do_pcm_hwsync(substream);
if (!ret) if (!ret)
ret = forward_appl_ptr(substream, frames, ret = forward_appl_ptr(substream, frames,
snd_pcm_capture_avail(runtime)); snd_pcm_avail(substream));
snd_pcm_stream_unlock_irq(substream); snd_pcm_stream_unlock_irq(substream);
return ret; return ret;
} }
...@@ -2830,10 +2791,7 @@ static int snd_pcm_rewind_ioctl(struct snd_pcm_substream *substream, ...@@ -2830,10 +2791,7 @@ static int snd_pcm_rewind_ioctl(struct snd_pcm_substream *substream,
return -EFAULT; return -EFAULT;
if (put_user(0, _frames)) if (put_user(0, _frames))
return -EFAULT; return -EFAULT;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) result = snd_pcm_rewind(substream, frames);
result = snd_pcm_playback_rewind(substream, frames);
else
result = snd_pcm_capture_rewind(substream, frames);
__put_user(result, _frames); __put_user(result, _frames);
return result < 0 ? result : 0; return result < 0 ? result : 0;
} }
...@@ -2848,10 +2806,7 @@ static int snd_pcm_forward_ioctl(struct snd_pcm_substream *substream, ...@@ -2848,10 +2806,7 @@ static int snd_pcm_forward_ioctl(struct snd_pcm_substream *substream,
return -EFAULT; return -EFAULT;
if (put_user(0, _frames)) if (put_user(0, _frames))
return -EFAULT; return -EFAULT;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) result = snd_pcm_forward(substream, frames);
result = snd_pcm_playback_forward(substream, frames);
else
result = snd_pcm_capture_forward(substream, frames);
__put_user(result, _frames); __put_user(result, _frames);
return result < 0 ? result : 0; return result < 0 ? result : 0;
} }
...@@ -2992,7 +2947,7 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream, ...@@ -2992,7 +2947,7 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
/* provided only for OSS; capture-only and no value returned */ /* provided only for OSS; capture-only and no value returned */
if (substream->stream != SNDRV_PCM_STREAM_CAPTURE) if (substream->stream != SNDRV_PCM_STREAM_CAPTURE)
return -EINVAL; return -EINVAL;
result = snd_pcm_capture_forward(substream, *frames); result = snd_pcm_forward(substream, *frames);
return result < 0 ? result : 0; return result < 0 ? result : 0;
} }
case SNDRV_PCM_IOCTL_HW_PARAMS: case SNDRV_PCM_IOCTL_HW_PARAMS:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7