From: Vinod Koul <vinod.koul@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, Vinod Koul <vinod.koul@linux.intel.com>,
broonie@opensource.wolfsonmicro.com, lrg@ti.com
Subject: [PATCH 2/3] ASoC: add device_buffer in asoc
Date: Fri, 31 Aug 2012 00:42:37 +0530 [thread overview]
Message-ID: <1346353958-7746-3-git-send-email-vinod.koul@linux.intel.com> (raw)
In-Reply-To: <1346353958-7746-1-git-send-email-vinod.koul@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---
include/sound/soc-dai.h | 6 ++++++
include/sound/soc.h | 7 ++++++-
sound/soc/soc-pcm.c | 13 +++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 628db7b..b0c84df 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -182,6 +182,12 @@ struct snd_soc_dai_ops {
*/
snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,
struct snd_soc_dai *);
+ /*
+ * For hardware based buffer reporting
+ * Optional.
+ */
+ snd_pcm_sframes_t (*buffer)(struct snd_pcm_substream *,
+ struct snd_soc_dai *);
};
/*
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 313b766..0d5046b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -795,7 +795,12 @@ struct snd_soc_platform_driver {
*/
snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,
struct snd_soc_dai *);
-
+ /*
+ * For hardware based buffer reporting
+ * Optional.
+ */
+ snd_pcm_sframes_t (*buffer)(struct snd_pcm_substream *,
+ struct snd_soc_dai *);
/* platform stream pcm ops */
struct snd_pcm_ops *ops;
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index ef22d0b..cd7b10f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -674,6 +674,7 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_uframes_t offset = 0;
snd_pcm_sframes_t delay = 0;
+ snd_pcm_sframes_t buffer = 0;
if (platform->driver->ops && platform->driver->ops->pointer)
offset = platform->driver->ops->pointer(substream);
@@ -687,7 +688,19 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
if (platform->driver->delay)
delay += platform->driver->delay(substream, codec_dai);
+ if (cpu_dai->driver->ops->buffer)
+ buffer += cpu_dai->driver->ops->buffer(substream, cpu_dai);
+
+ if (codec_dai->driver->ops->buffer)
+ buffer += codec_dai->driver->ops->buffer(substream, codec_dai);
+
+ if (platform->driver->buffer)
+ buffer += platform->driver->buffer(substream, codec_dai);
+
+
+
runtime->delay = delay;
+ runtime->device_buffer = buffer;
return offset;
}
--
1.7.9.5
next prev parent reply other threads:[~2012-08-30 19:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-30 19:12 [PATCH 0/3] introduce device_buffer Vinod Koul
2012-08-30 19:12 ` [PATCH 1/3] ALSA: pcm - " Vinod Koul
2012-08-30 19:12 ` Vinod Koul [this message]
2012-08-30 19:12 ` [PATCH 3/3] ASoC: mid-x86 - implement buffer query in sst_platform driver Vinod Koul
2012-08-31 21:22 ` [PATCH 0/3] introduce device_buffer Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2012-08-31 1:14 [PATCH v3 " Vinod Koul
2012-08-31 1:14 ` [PATCH 2/3] ASoC: add device_buffer in asoc Vinod Koul
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=1346353958-7746-3-git-send-email-vinod.koul@linux.intel.com \
--to=vinod.koul@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@ti.com \
--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.