From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: broonie@opensource.wolfsonmicro.com, tiwai@suse.de
Cc: alsa-devel@alsa-project.org, vinod.koul@intel.com,
patches@opensource.wolfsonmicro.com, lgirdwood@gmail.com,
Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Subject: [PATCH 4/7] ALSA: compress_core: Add support for capture streams
Date: Thu, 11 Apr 2013 19:00:42 +0100 [thread overview]
Message-ID: <1365703245-20738-5-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1365703245-20738-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
sound/core/compress_offload.c | 43 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 52ca4cc..d0fc9a1 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -296,7 +296,41 @@ static ssize_t snd_compr_write(struct file *f, const char __user *buf,
static ssize_t snd_compr_read(struct file *f, char __user *buf,
size_t count, loff_t *offset)
{
- return -ENXIO;
+ struct snd_compr_file *data = f->private_data;
+ struct snd_compr_stream *stream;
+ size_t avail;
+ int retval;
+
+ if (snd_BUG_ON(!data))
+ return -EFAULT;
+
+ stream = &data->stream;
+ mutex_lock(&stream->device->lock);
+
+ /* read is allowed when stream is running */
+ if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING) {
+ retval = -EBADFD;
+ goto out;
+ }
+
+ avail = snd_compr_get_avail(stream);
+ pr_debug("avail returned %ld\n", (unsigned long)avail);
+ /* calculate how much we can read from buffer */
+ if (avail > count)
+ avail = count;
+
+ if (stream->ops->copy) {
+ retval = stream->ops->copy(stream, buf, avail);
+ } else {
+ retval = -ENXIO;
+ goto out;
+ }
+ if (retval > 0)
+ stream->runtime->total_bytes_transferred += retval;
+
+out:
+ mutex_unlock(&stream->device->lock);
+ return retval;
}
static int snd_compr_mmap(struct file *f, struct vm_area_struct *vma)
@@ -481,7 +515,12 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)
retval = stream->ops->set_params(stream, params);
if (retval)
goto out;
- stream->runtime->state = SNDRV_PCM_STATE_SETUP;
+
+ if (stream->direction == SND_COMPRESS_PLAYBACK)
+ stream->runtime->state = SNDRV_PCM_STATE_SETUP;
+ else
+ stream->runtime->state = SNDRV_PCM_STATE_PREPARED;
+
stream->metadata_set = false;
stream->next_track = false;
} else {
--
1.7.2.5
next prev parent reply other threads:[~2013-04-11 18:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-11 18:00 [PATCH 0/7] Add capture support to compress API Charles Keepax
2013-04-11 18:00 ` [PATCH 1/7] ALSA: compress_core: Update calc_avail to use cumulative values Charles Keepax
2013-04-15 16:13 ` Vinod Koul
2013-04-16 13:40 ` Richard Fitzgerald
2013-04-17 14:27 ` Mark Brown
2013-04-11 18:00 ` [PATCH 2/7] ALSA: compress_core: Calculate avail correctly for capture streams Charles Keepax
2013-04-11 18:00 ` [PATCH 3/7] ALSA: compress_core: Deconstify copy callback buffer Charles Keepax
2013-04-11 18:00 ` Charles Keepax [this message]
2013-04-11 18:00 ` [PATCH 5/7] ASoC: soc-compress: Deduce stream direction Charles Keepax
2013-04-11 18:00 ` [PATCH 6/7] ALSA: compress_core: Remove unused hw_pointer Charles Keepax
2013-04-11 18:00 ` [PATCH 7/7] ALSA: compress_core: Rework writes to use cumulative values Charles Keepax
-- strict thread matches above, loose matches on Subject: below --
2013-04-18 9:58 [PATCH 0/7] Add capture support to compress API Richard Fitzgerald
[not found] ` <61f3f3c2-726d-4fde-af44-608a154ea183@opensource.wolfsonmicro.com>
2013-04-19 13:25 ` [PATCH 4/7] ALSA: compress_core: Add support for capture streams Vinod Koul
2013-04-19 14:42 ` Richard Fitzgerald
2013-04-19 23:41 ` Leanne Girdwood
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=1365703245-20738-5-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lgirdwood@gmail.com \
--cc=patches@opensource.wolfsonmicro.com \
--cc=tiwai@suse.de \
--cc=vinod.koul@intel.com \
/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.