From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: clemens@ladisch.de, tiwai@suse.de
Cc: alsa-devel@alsa-project.org, ffado-devel@lists.sourceforge.net
Subject: [PATCH 28/30] ALSA: oxfw: add support for capturing PCM samples
Date: Sat, 29 Nov 2014 00:59:37 +0900 [thread overview]
Message-ID: <1417190379-4172-29-git-send-email-o-takashi@sakamocchi.jp> (raw)
In-Reply-To: <1417190379-4172-1-git-send-email-o-takashi@sakamocchi.jp>
In previous commit, a support for transmitted packets is added. This commit
add a support for capturing PCM samples.
When any streams are already started, this driver should not change sampling
rate of the device, thus this commit also adds a restriction of sampling rate
in this situation.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
sound/firewire/oxfw/oxfw-pcm.c | 201 +++++++++++++++++++++++++++++++++++++----
1 file changed, 181 insertions(+), 20 deletions(-)
diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
index a78339c..9db40bf 100644
--- a/sound/firewire/oxfw/oxfw-pcm.c
+++ b/sound/firewire/oxfw/oxfw-pcm.c
@@ -118,21 +118,31 @@ static void limit_period_and_buffer(struct snd_pcm_hardware *hw)
hw->buffer_bytes_max = hw->period_bytes_max * hw->periods_min;
}
-static int pcm_open(struct snd_pcm_substream *substream)
+static int init_hw_params(struct snd_oxfw *oxfw,
+ struct snd_pcm_substream *substream)
{
- struct snd_oxfw *oxfw = substream->private_data;
struct snd_pcm_runtime *runtime = substream->runtime;
u8 **formats;
+ struct amdtp_stream *stream;
int err;
- formats = oxfw->rx_stream_formats;
-
runtime->hw.info = SNDRV_PCM_INFO_BATCH |
SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_INTERLEAVED |
+ SNDRV_PCM_INFO_JOINT_DUPLEX |
SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID;
+ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
+ runtime->hw.formats = AMDTP_IN_PCM_FORMAT_BITS;
+ stream = &oxfw->tx_stream;
+ formats = oxfw->tx_stream_formats;
+ } else {
+ runtime->hw.formats = AMDTP_OUT_PCM_FORMAT_BITS;
+ stream = &oxfw->rx_stream;
+ formats = oxfw->rx_stream_formats;
+ }
+
limit_channels_and_rates(&runtime->hw, formats);
limit_period_and_buffer(&runtime->hw);
@@ -148,10 +158,55 @@ static int pcm_open(struct snd_pcm_substream *substream)
if (err < 0)
goto end;
- err = amdtp_stream_add_pcm_hw_constraints(&oxfw->rx_stream, runtime);
+ err = amdtp_stream_add_pcm_hw_constraints(stream, runtime);
+end:
+ return err;
+}
+
+static int limit_to_current_params(struct snd_pcm_substream *substream)
+{
+ struct snd_oxfw *oxfw = substream->private_data;
+ struct snd_oxfw_stream_formation formation;
+ enum avc_general_plug_dir dir;
+ int err;
+
+ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+ dir = AVC_GENERAL_PLUG_DIR_OUT;
+ else
+ dir = AVC_GENERAL_PLUG_DIR_IN;
+
+ err = snd_oxfw_stream_get_current_formation(oxfw, dir, &formation);
+ if (err < 0)
+ goto end;
+
+ substream->runtime->hw.channels_min = formation.pcm;
+ substream->runtime->hw.channels_max = formation.pcm;
+ substream->runtime->hw.rate_min = formation.rate;
+ substream->runtime->hw.rate_max = formation.rate;
+end:
+ return err;
+}
+
+static int pcm_open(struct snd_pcm_substream *substream)
+{
+ struct snd_oxfw *oxfw = substream->private_data;
+ int err;
+
+ err = init_hw_params(oxfw, substream);
if (err < 0)
goto end;
+ /*
+ * When any PCM streams are already running, the available sampling
+ * rate is limited at current value.
+ */
+ if (amdtp_stream_pcm_running(&oxfw->tx_stream) ||
+ amdtp_stream_pcm_running(&oxfw->rx_stream)) {
+ err = limit_to_current_params(substream);
+ if (err < 0)
+ goto end;
+ }
+
snd_pcm_set_sync(substream);
end:
return err;
@@ -162,28 +217,90 @@ static int pcm_close(struct snd_pcm_substream *substream)
return 0;
}
-static int pcm_hw_params(struct snd_pcm_substream *substream,
- struct snd_pcm_hw_params *hw_params)
+static int pcm_capture_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *hw_params)
+{
+ struct snd_oxfw *oxfw = substream->private_data;
+
+ mutex_lock(&oxfw->mutex);
+
+ if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN)
+ oxfw->capture_substreams++;
+
+ mutex_unlock(&oxfw->mutex);
+
+ amdtp_stream_set_pcm_format(&oxfw->tx_stream, params_format(hw_params));
+
+ return snd_pcm_lib_alloc_vmalloc_buffer(substream,
+ params_buffer_bytes(hw_params));
+}
+static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *hw_params)
{
struct snd_oxfw *oxfw = substream->private_data;
+ mutex_lock(&oxfw->mutex);
+
+ if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN)
+ oxfw->playback_substreams++;
+
+ mutex_unlock(&oxfw->mutex);
+
amdtp_stream_set_pcm_format(&oxfw->rx_stream, params_format(hw_params));
+
return snd_pcm_lib_alloc_vmalloc_buffer(substream,
params_buffer_bytes(hw_params));
}
-static int pcm_hw_free(struct snd_pcm_substream *substream)
+static int pcm_capture_hw_free(struct snd_pcm_substream *substream)
{
struct snd_oxfw *oxfw = substream->private_data;
mutex_lock(&oxfw->mutex);
+
+ if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
+ oxfw->capture_substreams--;
+
+ snd_oxfw_stream_stop_simplex(oxfw, &oxfw->tx_stream);
+
+ mutex_unlock(&oxfw->mutex);
+
+ return snd_pcm_lib_free_vmalloc_buffer(substream);
+}
+static int pcm_playback_hw_free(struct snd_pcm_substream *substream)
+{
+ struct snd_oxfw *oxfw = substream->private_data;
+
+ mutex_lock(&oxfw->mutex);
+
+ if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
+ oxfw->playback_substreams--;
+
snd_oxfw_stream_stop_simplex(oxfw, &oxfw->rx_stream);
+
mutex_unlock(&oxfw->mutex);
return snd_pcm_lib_free_vmalloc_buffer(substream);
}
-static int pcm_prepare(struct snd_pcm_substream *substream)
+static int pcm_capture_prepare(struct snd_pcm_substream *substream)
+{
+ struct snd_oxfw *oxfw = substream->private_data;
+ struct snd_pcm_runtime *runtime = substream->runtime;
+ int err;
+
+ mutex_lock(&oxfw->mutex);
+ err = snd_oxfw_stream_start_simplex(oxfw, &oxfw->tx_stream,
+ runtime->rate, runtime->channels);
+ mutex_unlock(&oxfw->mutex);
+ if (err < 0)
+ goto end;
+
+ amdtp_stream_pcm_prepare(&oxfw->tx_stream);
+end:
+ return err;
+}
+static int pcm_playback_prepare(struct snd_pcm_substream *substream)
{
struct snd_oxfw *oxfw = substream->private_data;
struct snd_pcm_runtime *runtime = substream->runtime;
@@ -201,7 +318,25 @@ end:
return err;
}
-static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)
+static int pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+ struct snd_oxfw *oxfw = substream->private_data;
+ struct snd_pcm_substream *pcm;
+
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ pcm = substream;
+ break;
+ case SNDRV_PCM_TRIGGER_STOP:
+ pcm = NULL;
+ break;
+ default:
+ return -EINVAL;
+ }
+ amdtp_stream_pcm_trigger(&oxfw->tx_stream, pcm);
+ return 0;
+}
+static int pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)
{
struct snd_oxfw *oxfw = substream->private_data;
struct snd_pcm_substream *pcm;
@@ -220,35 +355,61 @@ static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)
return 0;
}
-static snd_pcm_uframes_t pcm_pointer(struct snd_pcm_substream *substream)
+static snd_pcm_uframes_t pcm_capture_pointer(struct snd_pcm_substream *sbstm)
{
- struct snd_oxfw *oxfw = substream->private_data;
+ struct snd_oxfw *oxfw = sbstm->private_data;
+
+ return amdtp_stream_pcm_pointer(&oxfw->tx_stream);
+}
+static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstm)
+{
+ struct snd_oxfw *oxfw = sbstm->private_data;
return amdtp_stream_pcm_pointer(&oxfw->rx_stream);
}
int snd_oxfw_create_pcm(struct snd_oxfw *oxfw)
{
- static struct snd_pcm_ops ops = {
+ static struct snd_pcm_ops capture_ops = {
.open = pcm_open,
.close = pcm_close,
.ioctl = snd_pcm_lib_ioctl,
- .hw_params = pcm_hw_params,
- .hw_free = pcm_hw_free,
- .prepare = pcm_prepare,
- .trigger = pcm_trigger,
- .pointer = pcm_pointer,
+ .hw_params = pcm_capture_hw_params,
+ .hw_free = pcm_capture_hw_free,
+ .prepare = pcm_capture_prepare,
+ .trigger = pcm_capture_trigger,
+ .pointer = pcm_capture_pointer,
+ .page = snd_pcm_lib_get_vmalloc_page,
+ .mmap = snd_pcm_lib_mmap_vmalloc,
+ };
+ static struct snd_pcm_ops playback_ops = {
+ .open = pcm_open,
+ .close = pcm_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = pcm_playback_hw_params,
+ .hw_free = pcm_playback_hw_free,
+ .prepare = pcm_playback_prepare,
+ .trigger = pcm_playback_trigger,
+ .pointer = pcm_playback_pointer,
.page = snd_pcm_lib_get_vmalloc_page,
.mmap = snd_pcm_lib_mmap_vmalloc,
};
struct snd_pcm *pcm;
+ unsigned int cap = 0;
int err;
- err = snd_pcm_new(oxfw->card, oxfw->card->driver, 0, 1, 0, &pcm);
+ if (oxfw->has_output)
+ cap = 1;
+
+ err = snd_pcm_new(oxfw->card, oxfw->card->driver, 0, 1, cap, &pcm);
if (err < 0)
return err;
+
pcm->private_data = oxfw;
strcpy(pcm->name, oxfw->card->shortname);
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &ops);
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &playback_ops);
+ if (cap > 0)
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &capture_ops);
+
return 0;
}
--
2.1.0
next prev parent reply other threads:[~2014-11-28 15:59 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-28 15:59 [PATCH 00/30 v3] ALSA: Enhancement for existed FireWire drivers Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 01/30] ALSA: dice: suppress checkpatch.pl warnings Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 02/30] ALSA: dice: Rename structure and its members Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 03/30] ALSA: dice: Move file to its own directory Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 04/30] ALSA: dice: Split transaction functionality into a file Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 05/30] ALSA: dice: Split stream " Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 06/30] ALSA: dice: Split PCM " Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 07/30] ALSA: dice: Split hwdep " Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 08/30] ALSA: dice: Split proc interface " Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 09/30] ALSA: dice: Add new functions for constraints of PCM parameters Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 10/30] ALSA: dice: Change the way to start stream Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 11/30] ALSA: dice: Add support for duplex streams with synchronization Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 12/30] ALSA: dice: Support for non SYT-Match sampling clock source mode Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 13/30] ALSA: dice: Add support for capturing PCM samples Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 14/30] ALSA: dice: Add support for MIDI capture/playback Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 15/30] ALSA: dice: remove experimental state Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 16/30] ALSA: speakers: Rename to oxfw and rename some members Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 17/30] ALSA: oxfw: Move to its own directory Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 18/30] ALSA: oxfw: Split stream functionality to a new file and add a header file Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 19/30] ALSA: oxfw: Split PCM functionality to a new file Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 20/30] ALSA: oxfw: Split control " Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 21/30] ALSA: oxfw: Change the way to name card Takashi Sakamoto
2014-11-29 19:37 ` Takashi Iwai
2014-11-30 4:33 ` Takashi Sakamoto
2014-11-30 8:31 ` Takashi Iwai
2014-11-30 23:19 ` Takashi Sakamoto
2014-12-01 8:41 ` Takashi Iwai
2014-12-01 11:21 ` Clemens Ladisch
2014-12-01 15:05 ` Takashi Sakamoto
2014-12-01 15:21 ` Takashi Iwai
2014-12-02 6:17 ` Takashi Sakamoto
2014-12-02 6:41 ` Takashi Iwai
2014-12-03 14:19 ` Takashi Sakamoto
2014-12-01 14:58 ` Takashi Sakamoto
2014-12-01 15:22 ` Takashi Iwai
2014-11-28 15:59 ` [PATCH 22/30] ALSA: oxfw: Add support for AV/C stream format command to get/set supported stream formation Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 23/30] ALSA: oxfw: Change the way to make PCM rules/constraints Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 24/30] ALSA: oxfw: Add proc interface for debugging purpose Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 25/30] ALSA: oxfw: Change the way to start stream Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 26/30] ALSA: oxfw: Add support for Behringer/Mackie devices Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 27/30] ALSA: oxfw: Add support AMDTP in-stream Takashi Sakamoto
2014-11-28 15:59 ` Takashi Sakamoto [this message]
2014-11-28 15:59 ` [PATCH 29/30] ALSA: oxfw: Add support for capture/playback MIDI messages Takashi Sakamoto
2014-11-28 15:59 ` [PATCH 30/30] ALSA: oxfw: Add hwdep interface Takashi Sakamoto
2014-11-28 16:03 ` [PATCH alsa-lib] hwdep: add OXFW driver support Takashi Sakamoto
2014-11-29 19:35 ` [PATCH 00/30 v3] ALSA: Enhancement for existed FireWire drivers Takashi Iwai
2014-11-30 3:21 ` Takashi Sakamoto
2014-11-30 8:35 ` Takashi Iwai
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=1417190379-4172-29-git-send-email-o-takashi@sakamocchi.jp \
--to=o-takashi@sakamocchi.jp \
--cc=alsa-devel@alsa-project.org \
--cc=clemens@ladisch.de \
--cc=ffado-devel@lists.sourceforge.net \
--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.