Draining will always playback somewhat beyond the end of the filled
buffer. This would produce artifacts if the user did not set up the
auto-silencing machinery, which is an extremely easy mistake to make, as
the API strongly suggests convenient fire-and-forget semantics. This
patch makes it work out of the box.
Applying this unconditionally is uncontroversial for RW_ACCESS, as the
buffer is fully controlled by the kernel in this case, which a) makes
failure to set up silencing even more likely and b) no detrimental
effects on user space are possible.
MMAP_ACCESS is a different matter:
- It can be argued that the user can be expected to know that the buffer
needs to be padded one way or another. I dispute that; of the numerous
resources I surveyed, only one mentioned this. Draining is a
convenience function also in the mmap case - an application that wants
to control things finely would just use start/stop and manage the
timing itself.
- It can be argued that it's a bad thing to overwrite a buffer the user
has access to without them explicitly requesting it. While technically
true, I think that's only a hypothetical issue - applications can be
expected to treat consumed samples as undefined data:
- The cases where playing back the same samples would be even useful
and practical are extremely limited.
- Most user code uses cross-platform/-API abstractions, which makes it
even less likely that they would get the idea that it's OK to re-use
buffered samples.
So I think the trade-off between fixing numerous applications and
potentially breaking some is skewed towards the former to the point that
it's not even a question.
We do the filling even if the driver supports exact draining
(SNDRV_PCM_TRIGGER_DRAIN), because a) the cost of filling two periods
from time to time is negligible, so it's not worth complicating the code
and b) so the behavior is consistent between drivers, so hypothetical
problems with the mmap case would be easier to reproduce.
It would be possible to add an opt-in API to the kernel and leave
actually enabling it to alsa-lib. However, this would add significant
overall complexity, for no obvious gain.
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@xxxxxx>
---
v2:
- fill only up to two periods, to avoid undue load with big buffers
- added discussion to commit message
---
sound/core/pcm_lib.c | 47 +++++++++++++++++++++++++----------------
sound/core/pcm_native.c | 3 ++-
2 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 5bb2129cceac..b8940ceeaedb 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -61,24 +61,35 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream)
runtime->silence_start = appl_ptr;
}
- // This will "legitimately" turn negative on underrun, and will be mangled
- // into a huge number by the boundary crossing handling. The initial state
- // might also be not quite sane. The code below MUST account for these cases.
- hw_avail = appl_ptr - runtime->status->hw_ptr;
- if (hw_avail < 0)
- hw_avail += runtime->boundary;
+ if (runtime->state == SNDRV_PCM_STATE_DRAINING) {
+ // We actually need only the next period boundary plus the FIFO size
+ // plus some slack for IRQ delays, but it's not worth calculating that.
+ frames = runtime->period_size * 2 - runtime->silence_filled;
+ if (frames <= 0)
+ return;
+ // Impossible, unless the buffer has only one period.
+ if (frames > runtime->buffer_size)
+ frames = runtime->buffer_size;
+ } else {
+ // This will "legitimately" turn negative on underrun, and will be mangled
+ // into a huge number by the boundary crossing handling. The initial state
+ // might also be not quite sane. The code below MUST account for these cases.
+ hw_avail = appl_ptr - runtime->status->hw_ptr;
+ if (hw_avail < 0)
+ hw_avail += runtime->boundary;
- noise_dist = hw_avail + runtime->silence_filled;
- if (runtime->silence_size < runtime->boundary) {
- frames = runtime->silence_threshold - noise_dist;
- if (frames <= 0)
- return;
- if (frames > runtime->silence_size)
- frames = runtime->silence_size;
- } else {
- frames = runtime->buffer_size - noise_dist;
- if (frames <= 0)
- return;
+ noise_dist = hw_avail + runtime->silence_filled;
+ if (runtime->silence_size < runtime->boundary) {
+ frames = runtime->silence_threshold - noise_dist;
+ if (frames <= 0)
+ return;
+ if (frames > runtime->silence_size)
+ frames = runtime->silence_size;
+ } else {
+ frames = runtime->buffer_size - noise_dist;
+ if (frames <= 0)
+ return;
+ }
}
if (snd_BUG_ON(frames > runtime->buffer_size))
@@ -443,7 +454,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
}
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
- runtime->silence_size > 0)
+ (runtime->silence_size > 0 || runtime->state == SNDRV_PCM_STATE_DRAINING))
snd_pcm_playback_silence(substream);
update_audio_tstamp(substream, &curr_tstamp, &audio_tstamp);
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 0e3e7997dc58..6ecb6a733606 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1454,7 +1454,7 @@ static void snd_pcm_post_start(struct snd_pcm_substream *substream,
runtime->rate;
__snd_pcm_set_state(runtime, state);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
- runtime->silence_size > 0)
+ (runtime->silence_size > 0 || state == SNDRV_PCM_STATE_DRAINING))
snd_pcm_playback_silence(substream);
snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MSTART);
}
@@ -2045,6 +2045,7 @@ static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream,
break;
case SNDRV_PCM_STATE_RUNNING:
__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_DRAINING);
+ snd_pcm_playback_silence(substream);
break;
case SNDRV_PCM_STATE_XRUN:
__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_SETUP);
--
2.40.0.152.g15d061e6df
