diff options
| author |   Ricardo Biehl Pasquali <pasqualirb@gmail.com> | 2018-09-07 16:58:54 -0300 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2018-09-10 09:06:55 +0200 |
| commit | 64b6acf60b665fffd419c23886a1cbeeb253cfb4 (patch) | |
| tree | fab5203c85f05f492949543c37d2e2994979eea1 /sound/core/pcm_lib.c | |
| parent | Merge branch 'topic/pcm-indirect-fixes' into for-next (diff) | |
| download | wireguard-linux-64b6acf60b665fffd419c23886a1cbeeb253cfb4.tar.xz wireguard-linux-64b6acf60b665fffd419c23886a1cbeeb253cfb4.zip | |
ALSA: pcm: Update hardware pointer before start capture
This ensures the transfer loop won't waste a run to read
the few frames (if any) between start and hw_ptr update.
It will wait for the next interrupt with wait_for_avail().
Signed-off-by: Ricardo Biehl Pasquali <pasqualirb@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm_lib.c')
| -rw-r--r-- | sound/core/pcm_lib.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 7f71c2449af5..40013b26f671 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -2172,6 +2172,10 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, if (err < 0) goto _end_unlock; + runtime->twake = runtime->control->avail_min ? : 1; + if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) + snd_pcm_update_hw_ptr(substream); + if (!is_playback && runtime->status->state == SNDRV_PCM_STATE_PREPARED) { if (size >= runtime->start_threshold) { @@ -2185,10 +2189,8 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, } } - runtime->twake = runtime->control->avail_min ? : 1; - if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) - snd_pcm_update_hw_ptr(substream); avail = snd_pcm_avail(substream); + while (size > 0) { snd_pcm_uframes_t frames, appl_ptr, appl_ofs; snd_pcm_uframes_t cont; |