From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Jaroslav Kysela <perex@perex.cz>
Cc: ALSA development <alsa-devel@alsa-project.org>
Subject: Re: [PATCH alsa-lib 1/4] pcm: hw: setup explicit silencing for snd_pcm_drain by default
Date: Wed, 3 May 2023 13:20:37 +0200 [thread overview]
Message-ID: <ZFJDhQZAiCPBpM0D@ugly> (raw)
In-Reply-To: <20230502115010.986325-2-perex@perex.cz>
On Tue, May 02, 2023 at 01:50:07PM +0200, Jaroslav Kysela wrote:
>Some applications may not follow the period_size transfer blocks and
>also the driver developers may not follow the consequeces of the
>access beyond valid samples in the playback DMA buffer.
>
i find this way too vague.
>To avoid clicks, fill a little silence at the end of the playback
>ring buffer when the snd_pcm_drain() is called.
>
no 'the' here.
(see
https://www.eltconcourse.com/training/inservice/lexicogrammar/article_system.html
for more than you ever wanted to know about articles.)
>--- a/src/pcm/pcm_hw.c
>+++ b/src/pcm/pcm_hw.c
>@@ -718,7 +732,40 @@ static int snd_pcm_hw_drop(snd_pcm_t *pcm)
> static int snd_pcm_hw_drain(snd_pcm_t *pcm)
> {
> snd_pcm_hw_t *hw = pcm->private_data;
>+ snd_pcm_sw_params_t sw_params;
>+ snd_pcm_uframes_t silence_size;
> int err;
>+
>+ if (pcm->stream != SND_PCM_STREAM_PLAYBACK)
>+ goto __skip_silence;
>
arguably, you should use the inverse condition and a block instead of a
goto.
if this is a measure to keep the indentation down, factoring it out to a
separate snd_pcm_hw_auto_silence() function should do the job.
>+ /* compute end silence size, align to period size + extra time */
>+ snd_pcm_sw_params_current_no_lock(pcm, &sw_params);
>
if you swap these lines here, there will be less churn in the followup
patch.
in the comment, better use a colon instead of a comma.
>+ if ((pcm->boundary % pcm->period_size) == 0) {
>+ silence_size = pcm->period_size - (*pcm->appl.ptr % pcm->period_size);
>+ if (silence_size == pcm->period_size)
>+ silence_size = 0;
>
you can avoid the condition by rewriting it like this:
silence_size = pcm->period_size - ((*pcm->appl.ptr + pcm->period_size - 1) % pcm->period_size) - 1;
(it may be possible to simplify this further, but this makes my head
hurt ...)
>+ } else {
>+ /* it not not easy to compute the period cross point
>
"it is not"
"crossing point"
>+ * in this case because period is not aligned to the boundary
>
"the period"
>+ * - use the full range (one period) in this case
>+ */
>+ silence_size = pcm->period_size;
>+ }
>+ silence_size += pcm->rate / 10; /* 1/10th of second */
>+ if (sw_params.silence_size < silence_size) {
>+ /* fill the silence soon as possible (in the bellow ioctl
>
"as soon as possible"
"in the ioctl below"
>+ * or the next period wake up)
>+ */
>+ sw_params.silence_threshold = pcm->buffer_size;
>+ sw_params.silence_size = silence_size;
>
so at this point i got the thought "huh, that can exceed the buffer
size. is that ok?" ...
and yes, it is. but ...
the kernel doesn't check silence_threshold, so user space can trigger
the snd_BUG_ON() in snd_pcm_playback_silence(). whoops.
(yes, this predates my patch.)
i'm not sure what the best way to deal with this is. anyway, different
tree, different patch.
regards
next prev parent reply other threads:[~2023-05-03 11:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 11:50 [PATCH alsa-lib 0/4] pcm: hw: implement explicit silencing for snd_pcm_drain Jaroslav Kysela
2023-05-02 11:50 ` [PATCH alsa-lib 1/4] pcm: hw: setup explicit silencing for snd_pcm_drain by default Jaroslav Kysela
2023-05-03 11:20 ` Oswald Buddenhagen [this message]
2023-05-03 20:19 ` Oswald Buddenhagen
2023-05-03 20:31 ` Jaroslav Kysela
2023-05-05 18:56 ` Oswald Buddenhagen
2023-05-02 11:50 ` [PATCH alsa-lib 2/4] pcm: hw: add drain_silence configuration keyword Jaroslav Kysela
2023-05-03 11:24 ` Oswald Buddenhagen
2023-05-03 14:22 ` Jaroslav Kysela
2023-05-03 15:39 ` Oswald Buddenhagen
2023-05-02 11:50 ` [PATCH alsa-lib 3/4] pcm: hw: introduce SNDRV_PCM_INFO_PERFECT_DRAIN Jaroslav Kysela
2023-05-03 11:25 ` Oswald Buddenhagen
2023-05-04 8:18 ` Takashi Iwai
2023-05-04 8:31 ` Jaroslav Kysela
2023-05-04 12:50 ` Takashi Iwai
2023-05-02 11:50 ` [PATCH alsa-lib 4/4] pcm: hw: introduce SNDRV_PCM_HW_PARAMS_DRAIN_SILENCE Jaroslav Kysela
2023-05-03 11:26 ` Oswald Buddenhagen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZFJDhQZAiCPBpM0D@ugly \
--to=oswald.buddenhagen@gmx.de \
--cc=alsa-devel@alsa-project.org \
--cc=perex@perex.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox