Skip to contentSkip to conversation

ALSA: compress: Add procfs info file for compressed nodes

PATCH Applied Richard Fitzgerald 3 participants 5 messages Nov 25, 2015 – Nov 30, 2015

Subsystems (3)
Sound ASoC Sound - compressed audio
lore
Share & tools
lore

Richard Fitzgerald

author
#0 lore raw

v3 cover ALSA: compress: Add procfs info file for compressed nodes

This updates the compress core code to create an 'info' file under procfs for each compressed node, like the PCM core does for PCM nodes.

Based off Takashi's for-next

Richard Fitzgerald (2):
ALSA: compress: Add procfs info file for compressed nodes
ALSA: compress: Pass id string to snd_compress_new

 include/sound/compress_driver.h |  7 +++-
 sound/core/compress_offload.c   | 86 ++++++++++++++++++++++++++++++++++++++++-
 sound/soc/soc-compress.c        |  8 +++-
 3 files changed, 97 insertions(+), 4 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v3 1/2 ALSA: compress: Add procfs info file for compressed nodes

This patch implements a procfs info file for compr nodes when SND_VERBOSE_PROCFS is enabled. This is equivalent to what the PCM core already does for pcm nodes.

Signed-off-by Richard Fitzgerald <[email protected]>
---
 include/sound/compress_driver.h |  5 +++
 sound/core/compress_offload.c   | 73 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 1 deletion(-)
include/sound/compress_driver.h +5 -0
index fa1d055..85c4237 100644
@@ -152,6 +152,11 @@ struct snd_compr {
 	unsigned int direction;
 	struct mutex lock;
 	int device;
+#ifdef CONFIG_SND_VERBOSE_PROCFS
+	char id[64];
+	struct snd_info_entry *proc_root;
+	struct snd_info_entry *proc_info_entry;
+#endif
 };
 
 /* compress device register APIs */
sound/core/compress_offload.c +72 -1

102 lines not on this page · raw message

Signature · 1 line
1.9.1
author
#2 lore raw

PATCH v3 2/2 ALSA: compress: Pass id string to snd_compress_new

In reply to Richard Fitzgerald

Make snd_compress_new take an id string (like snd_pcm_new). This string can be included in the procfs info.

This patch also updates soc_new_compress() to create an ID based on the stream and dai name, as done for PCM streams.

Signed-off-by Richard Fitzgerald <[email protected]>
---
 include/sound/compress_driver.h |  2 +-
 sound/core/compress_offload.c   | 13 ++++++++++++-
 sound/soc/soc-compress.c        |  8 +++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)
include/sound/compress_driver.h +1 -1
index 85c4237..c0abcdc 100644
@@ -163,7 +163,7 @@ struct snd_compr {
 int snd_compress_register(struct snd_compr *device);
 int snd_compress_deregister(struct snd_compr *device);
 int snd_compress_new(struct snd_card *card, int device,
-			int type, struct snd_compr *compr);
+			int type, const char *id, struct snd_compr *compr);
 
 /* dsp driver callback apis
  * For playback: driver should call snd_compress_fragment_elapsed() to let the
sound/core/compress_offload.c +12 -1
index 1258e9d..2c52510 100644
@@ -945,6 +945,11 @@ static void snd_compress_proc_done(struct snd_compr *compr)
 	snd_info_free_entry(compr->proc_root);
 	compr->proc_root = NULL;
 }
+
+static inline void snd_compress_set_id(struct snd_compr *compr, const char *id)
+{
+	strlcpy(compr->id, id, sizeof(compr->id));
+}
 #else
 static inline int snd_compress_proc_init(struct snd_compr *compr)
 {

@@ -954,6 +959,10 @@ static inline int snd_compress_proc_init(struct snd_compr *compr)
 static inline void snd_compress_proc_done(struct snd_compr *compr)
 {
 }
+
+static inline void snd_compress_set_id(struct snd_compr *compr, const char *id)
+{
+}
 #endif
 
 static int snd_compress_dev_free(struct snd_device *device)

@@ -974,7 +983,7 @@ static int snd_compress_dev_free(struct snd_device *device)
  * @compr: compress device pointer
  */
 int snd_compress_new(struct snd_card *card, int device,
-			int dirn, struct snd_compr *compr)
+			int dirn, const char *id, struct snd_compr *compr)
 {
 	static struct snd_device_ops ops = {
 		.dev_free = snd_compress_dev_free,

@@ -987,6 +996,8 @@ int snd_compress_new(struct snd_card *card, int device,
 	compr->device = device;
 	compr->direction = dirn;
 
+	snd_compress_set_id(compr, id);
+
 	snd_device_initialize(&compr->dev, card);
 	dev_set_name(&compr->dev, "comprC%iD%i", card->number, device);
sound/soc/soc-compress.c +7 -1
index 12a9820..fffbe6f 100644
@@ -689,7 +689,13 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
 		compr->ops->copy = soc_compr_copy;
 
 	mutex_init(&compr->lock);
-	ret = snd_compress_new(rtd->card->snd_card, num, direction, compr);
+
+	snprintf(new_name, sizeof(new_name), "%s %s-%d",
+		 rtd->dai_link->stream_name,
+		 rtd->codec_dai->name, num);
+
+	ret = snd_compress_new(rtd->card->snd_card, num, direction,
+				new_name, compr);
 	if (ret < 0) {
 		pr_err("compress asoc: can't create compress for codec %s\n",
 			codec->component.name);
Signature · 1 line
1.9.1
Applied
#4 lore raw
In reply to Richard Fitzgerald
Quoted 9 lines · Richard Fitzgerald

This updates the compress core code to create an 'info' file under procfs for each compressed node, like the PCM core does for PCM nodes.

Based off Takashi's for-next

Richard Fitzgerald (2):
ALSA: compress: Add procfs info file for compressed nodes
ALSA: compress: Pass id string to snd_compress_new

I applied both patches now to topic/compress-id branch (and merged back to for-next branch, too).

Mark, pull topic/compress-id branch to your tree if necessary.

thanks,

Takashi

Quoted 10 lines
 include/sound/compress_driver.h |  7 +++-
 sound/core/compress_offload.c   | 86 ++++++++++++++++++++++++++++++++++++++++-
 sound/soc/soc-compress.c        |  8 +++-
 3 files changed, 97 insertions(+), 4 deletions(-)
Signature · 1 line
1.9.1