Skip to contentSkip to conversation

ASoC: soc_compress: Add set_metadata

PATCH In review Richard Fitzgerald 2 participants 3 messages Nov 25, 2013 – Dec 2, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: soc_compress: Add set_metadata

Pass the set_metadata() calls through to the codec driver.

---
 sound/soc/soc-compress.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
sound/soc/soc-compress.c +17 -1
index 53c9ecd..186802b 100644
@@ -318,6 +318,21 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
 	mutex_unlock(&rtd->pcm_mutex);
 	return 0;
 }
+static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
+			struct snd_compr_metadata *metadata)
+{
+	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+	struct snd_soc_platform *platform = rtd->platform;
+
+	mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
+
+	if (platform->driver->compr_ops && platform->driver->compr_ops->set_metadata)
+		 platform->driver->compr_ops->set_metadata(cstream, metadata);
+
+	mutex_unlock(&rtd->pcm_mutex);
+	return 0;
+}
+
 
 static int soc_compr_copy(struct snd_compr_stream *cstream,
 			  char __user *buf, size_t count)
@@ -372,7 +387,8 @@ static struct snd_compr_ops soc_compr_ops = {
 	.pointer	= soc_compr_pointer,
 	.ack		= soc_compr_ack,
 	.get_caps	= soc_compr_get_caps,
-	.get_codec_caps = soc_compr_get_codec_caps
+	.get_codec_caps = soc_compr_get_codec_caps,
+	.set_metadata = soc_compr_set_metadata,
 };
 
 /* create a new compress */
Signature · 1 line
1.7.2.5
#1 lore raw
Quoted 36 lines · Richard Fitzgerald

Pass the set_metadata() calls through to the codec driver.

---
 sound/soc/soc-compress.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
sound/soc/soc-compress.c +15 -0
index 53c9ecd..186802b 100644
@@ -318,6 +318,21 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
 	mutex_unlock(&rtd->pcm_mutex);
 	return 0;
 }
+static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
+			struct snd_compr_metadata *metadata)
+{
+	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+	struct snd_soc_platform *platform = rtd->platform;
+
+	mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
+
+	if (platform->driver->compr_ops && platform->driver->compr_ops->set_metadata)
+		 platform->driver->compr_ops->set_metadata(cstream, metadata);
+
+	mutex_unlock(&rtd->pcm_mutex);
+	return 0;
+}
+
 
 static int soc_compr_copy(struct snd_compr_stream *cstream,
 			  char __user *buf, size_t count)

sound/soc/soc-compress.c static struct snd_compr_ops soc_compr_ops = { · line 391

Quoted 6 lines
sound/soc/soc-compress.c +2 -1
@@ -372,7 +387,8 @@ static struct snd_compr_ops soc_compr_ops = {
 	.pointer	= soc_compr_pointer,
 	.ack		= soc_compr_ack,
 	.get_caps	= soc_compr_get_caps,
-	.get_codec_caps = soc_compr_get_codec_caps
+	.get_codec_caps = soc_compr_get_codec_caps,
+	.set_metadata = soc_compr_set_metadata,

Sorry am confused by this and the patch description? The set_metadata call exists so how is this propogating to codec? Also which tree has this been generated against?

--
~Vinod

#2 lore raw
Quoted 47 lines · Vinod Koul
Quoted 36 lines · Richard Fitzgerald

Pass the set_metadata() calls through to the codec driver.

---
 sound/soc/soc-compress.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
sound/soc/soc-compress.c +15 -0
index 53c9ecd..186802b 100644
@@ -318,6 +318,21 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
 	mutex_unlock(&rtd->pcm_mutex);
 	return 0;
 }
+static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
+			struct snd_compr_metadata *metadata)
+{
+	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+	struct snd_soc_platform *platform = rtd->platform;
+
+	mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
+
+	if (platform->driver->compr_ops && platform->driver->compr_ops->set_metadata)
+		 platform->driver->compr_ops->set_metadata(cstream, metadata);
+
+	mutex_unlock(&rtd->pcm_mutex);
+	return 0;
+}
+
 
 static int soc_compr_copy(struct snd_compr_stream *cstream,
 			  char __user *buf, size_t count)

sound/soc/soc-compress.c static struct snd_compr_ops soc_compr_ops = { · line 391

Quoted 6 lines
sound/soc/soc-compress.c +2 -1
@@ -372,7 +387,8 @@ static struct snd_compr_ops soc_compr_ops = {
 	.pointer	= soc_compr_pointer,
 	.ack		= soc_compr_ack,
 	.get_caps	= soc_compr_get_caps,
-	.get_codec_caps = soc_compr_get_codec_caps
+	.get_codec_caps = soc_compr_get_codec_caps,
+	.set_metadata = soc_compr_set_metadata,

Sorry am confused by this and the patch description? The set_metadata call exists so how is this propogating to codec? Also which tree has this been generated against?

Quoted 3 lines

--
~Vinod

My fault. I was sure I checked against broonie's for-next and these function were missing, but I must have checked against something old. Patch abandoned!