| Message ID | 1448444918-29760-3-git-send-email-rf@opensource.wolfsonmicro.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> @@ -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); Adding an ID with a human-readable name sounds good. Wondering though if the codec_dai name is relevant for compressed streams? In all the configurations we have with DPCM the name is snd-soc-dummy-dai, there is no connection to the codec proper. stream_name and id should be good enough, no?
On Wed, 2015-11-25 at 08:51 -0600, Pierre-Louis Bossart wrote: > > @@ -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); > > Adding an ID with a human-readable name sounds good. > Wondering though if the codec_dai name is relevant for compressed > streams? I think it is, that was the original reason I wrote this patch. I'm writing some automated tests where I have to know what each stream is really connected to and the DAI name is important for that (in my case anyway). Since the PCM core already provides that in the info file it seemed reasonable to do the same for compressed. > > In all the configurations we have with DPCM the name is > snd-soc-dummy-dai, there is no connection to the codec proper. > stream_name and id should be good enough, no? There's going to be systems where the DAI name is something real and I can't see a disadvantage in providing that extra piece of information, just in case it's useful. I've kept the format the same as the equivalent for PCM
diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 85c4237..c0abcdc 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -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 diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index d133915..dd70926 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -976,7 +976,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, @@ -989,6 +989,10 @@ int snd_compress_new(struct snd_card *card, int device, compr->device = device; compr->direction = dirn; + if (IS_ENABLED(CONFIG_SND_VERBOSE_PROCFS)) + if (id) + strlcpy(compr->id, id, sizeof(compr->id)); + snd_device_initialize(&compr->dev, card); dev_set_name(&compr->dev, "comprC%iD%i", card->number, device); diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 12a9820..fffbe6f 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -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);
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 <rf@opensource.wolfsonmicro.com> --- include/sound/compress_driver.h | 2 +- sound/core/compress_offload.c | 6 +++++- sound/soc/soc-compress.c | 8 +++++++- 3 files changed, 13 insertions(+), 3 deletions(-)