All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: tiwai@suse.de
Cc: alsa-devel@alsa-project.org
Subject: [PATCH alsa-lib 10/12] pcm: hw: add a helper function to issue avail_min without sub-effects
Date: Fri, 30 Jun 2017 08:58:26 +0900	[thread overview]
Message-ID: <20170629235828.18076-11-o-takashi@sakamocchi.jp> (raw)
In-Reply-To: <20170629235828.18076-1-o-takashi@sakamocchi.jp>

At present, applications can change avail_min parameter of PCM substream
by two ways; via mapped control data, and by executing ioctl(2) with
SNDRV_PCM_IOCTL_SYNC_PTR. The former is available in a case that the
applications map the data successfully.

When utilizing alsa-lib API, the above is done by a call of
'snd_pcm_sw_params()' to hw PCM plugin. In current implementation, this
call has an sub-effect to issue appl_ptr unexpectedly.

This commit adds a helper function to issue avail_min without the
sub-effect.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 src/pcm/pcm_hw.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index aacfa669..c8fef64d 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -151,6 +151,15 @@ static int sync_ptr(snd_pcm_hw_t *hw, unsigned int flags)
 	return 0;
 }
 
+static int issue_avail_min(snd_pcm_hw_t *hw)
+{
+	if (!hw->mmap_control_fallbacked)
+		return 0;
+
+	/* Avoid unexpected change of applptr in kernel space. */
+	return sync_ptr1(hw, SNDRV_PCM_SYNC_PTR_APPL);
+}
+
 static int issue_applptr(snd_pcm_hw_t *hw)
 {
 	if (!hw->mmap_control_fallbacked)
@@ -492,7 +501,7 @@ static int snd_pcm_hw_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
 	    params->silence_size == pcm->silence_size &&
 	    old_period_event == hw->period_event) {
 		hw->mmap_control->avail_min = params->avail_min;
-		return sync_ptr(hw, 0);
+		return issue_avail_min(hw);
 	}
 	if (params->tstamp_type == SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW &&
 	    hw->version < SNDRV_PROTOCOL_VERSION(2, 0, 12)) {
-- 
2.11.0

  parent reply	other threads:[~2017-06-29 23:58 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-29 23:58 [PATCH alsa-lib 00/12] pcm: hw: optimization for v2.0.14 of PCM protocol/interface Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 01/12] pcm: hw: fix to initialize function local variable Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 02/12] pcm: hw: add a helper function just to query status/control data of PCM substream Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 03/12] pcm: hw: use heler function to query status/control data after reading/writing PCM frames Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 04/12] pcm: hw: use helper function to query status/control data after HW_PARAMS call Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 05/12] pcm: hw: use helper function to query status/control data after PREPARE/RESET call Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 06/12] pcm: hw: use helper function to query status/control data after REWIND/FORWARD call Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 07/12] pcm: hw: use helper function to query status/control data for calculation of available space on PCM buffer Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 08/12] pcm: hw: add a helper function to request hwsync without side-effects Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 09/12] pcm: hw: add a helper function to issue appl_ptr without sub-effects Takashi Sakamoto
2017-06-29 23:58 ` Takashi Sakamoto [this message]
2017-06-29 23:58 ` [PATCH alsa-lib 11/12] pcm: hw: remove superfluous code to call of SNDRV_PCM_IOCTL_SYNC_PTR in snd_pcm_hw_forward() Takashi Sakamoto
2017-06-29 23:58 ` [PATCH alsa-lib 12/12] pcm: hw: minor refactoring for initialization of control data Takashi Sakamoto
2017-06-30  6:43 ` [PATCH alsa-lib 00/12] pcm: hw: optimization for v2.0.14 of PCM protocol/interface Takashi Sakamoto

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=20170629235828.18076-11-o-takashi@sakamocchi.jp \
    --to=o-takashi@sakamocchi.jp \
    --cc=alsa-devel@alsa-project.org \
    --cc=tiwai@suse.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.