From: Clemens Ladisch <clemens@ladisch.de>
To: Takashi Iwai <tiwai@suse.de>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
alsa-devel@alsa-project.org
Subject: [RFC PATCH 10/11] ALSA: usb-audio: add terminal/unit entities and links
Date: Tue, 28 Aug 2012 00:35:44 +0200 [thread overview]
Message-ID: <503BF640.1030509@ladisch.de> (raw)
In-Reply-To: <503BF48E.1090100@ladisch.de>
Use the terminal/unit descriptors to create entities and links.
(This should be integrated with parse_audio_unit(), but that function
does not yet support all unit types.)
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
---
sound/usb/mixer.c | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 278 insertions(+), 0 deletions(-)
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 4f40ba8..a5fa807 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -45,6 +45,7 @@
#include <linux/bitops.h>
#include <linux/init.h>
#include <linux/list.h>
+#include <linux/media.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/usb.h>
@@ -55,6 +56,7 @@
#include <sound/control.h>
#include <sound/hwdep.h>
#include <sound/info.h>
+#include <sound/media.h>
#include <sound/tlv.h>
#include "usbaudio.h"
@@ -1969,6 +1971,278 @@ static int snd_usb_mixer_dev_free(struct snd_device *device)
return 0;
}
+static void unit_name(struct media_entity_desc *entity,
+ const u8 *desc, const char *prefix)
+{
+ /* TODO: read the terminal name from the device */
+ sprintf(entity->name, "%s%u", prefix, desc[3]);
+}
+
+static int input_terminal_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "IT");
+ desc->type = MEDIA_ENT_T_JACK;
+ return 0;
+}
+
+static int output_terminal_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "OT");
+ desc->type = MEDIA_ENT_T_JACK;
+ return 0;
+}
+
+static int mixer_unit_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "MU");
+ desc->type = MEDIA_ENT_T_ALSA_MIXER;
+ return 0;
+}
+
+static int selector_unit_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "SU");
+ desc->type = MEDIA_ENT_T_ALSA_SELECTOR;
+ return 0;
+}
+
+static int feature_unit_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "FU");
+ desc->type = MEDIA_ENT_T_ALSA_PROCESSING;
+ return 0;
+}
+
+static int processing_unit_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "PU");
+ desc->type = MEDIA_ENT_T_ALSA_PROCESSING;
+ return 0;
+}
+
+static int extension_unit_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "XU");
+ desc->type = MEDIA_ENT_T_ALSA_PROCESSING;
+ return 0;
+}
+
+static int effect_unit_v2_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "EU");
+ desc->type = MEDIA_ENT_T_ALSA_PROCESSING;
+ return 0;
+}
+
+static int src_v2_get_desc(struct snd_card *card,
+ void *private_data,
+ struct media_entity_desc *desc)
+{
+ unit_name(desc, private_data, "SRC");
+ desc->type = MEDIA_ENT_T_ALSA_PROCESSING;
+ return 0;
+}
+
+static int snd_usb_mixer_entity(struct mixer_build *state, const u8 *desc)
+{
+ snd_media_entity_get_desc_t get_desc = NULL;
+ unsigned int sinks = 0, sources = 0, source_ids_count = 0, i;
+ const u8 *source_ids = NULL;
+ u8 source_id = 0;
+ int err;
+
+ if (desc[0] < 4)
+ return 0;
+
+ if (state->mixer->protocol == UAC_VERSION_1) {
+ switch (desc[2]) {
+ case UAC_INPUT_TERMINAL:
+ if (desc[0] >= 6 &&
+ desc[5] != (UAC_TERMINAL_STREAMING >> 8)) {
+ get_desc = &input_terminal_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC_OUTPUT_TERMINAL:
+ if (desc[0] >= 8) {
+ source_id = desc[7];
+ if (desc[5] != (UAC_TERMINAL_STREAMING >> 8))
+ get_desc = &output_terminal_get_desc;
+ }
+ break;
+ case UAC_MIXER_UNIT:
+ if (desc[0] >= 6) {
+ source_ids = &desc[5];
+ get_desc = &mixer_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC_SELECTOR_UNIT:
+ if (desc[0] >= 6) {
+ source_ids = &desc[5];
+ get_desc = &selector_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC_FEATURE_UNIT:
+ if (desc[0] >= 5) {
+ source_id = desc[4];
+ get_desc = &feature_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC1_PROCESSING_UNIT:
+ if (desc[0] >= 8) {
+ source_ids = &desc[7];
+ get_desc = &processing_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC1_EXTENSION_UNIT:
+ if (desc[0] >= 7 && desc[0] >= 7 + desc[6]) {
+ source_ids_count = desc[6];
+ source_ids = &desc[7];
+ get_desc = &extension_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ }
+ } else {
+ switch (desc[2]) {
+ case UAC_INPUT_TERMINAL:
+ if (desc[0] >= 6 &&
+ desc[5] != (UAC_TERMINAL_STREAMING >> 8)) {
+ get_desc = &input_terminal_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC_OUTPUT_TERMINAL:
+ if (desc[0] >= 8) {
+ source_id = desc[7];
+ if (desc[5] != (UAC_TERMINAL_STREAMING >> 8))
+ get_desc = &output_terminal_get_desc;
+ }
+ break;
+ case UAC_MIXER_UNIT:
+ if (desc[0] >= 5 && desc[0] >= 5 + desc[4]) {
+ source_ids_count = desc[4];
+ source_ids = &desc[5];
+ get_desc = &mixer_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC_SELECTOR_UNIT:
+ if (desc[0] >= 5 && desc[0] >= 5 + desc[4]) {
+ source_ids_count = desc[4];
+ source_ids = &desc[5];
+ get_desc = &selector_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC_FEATURE_UNIT:
+ if (desc[0] >= 5) {
+ source_id = desc[4];
+ get_desc = &feature_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC2_EFFECT_UNIT:
+ if (desc[0] >= 7) {
+ source_id = desc[6];
+ get_desc = &effect_unit_v2_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC2_PROCESSING_UNIT_V2:
+ if (desc[0] >= 7 && desc[0] >= 7 + desc[6]) {
+ source_ids_count = desc[6];
+ source_ids = &desc[7];
+ get_desc = &processing_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC2_EXTENSION_UNIT_V2:
+ if (desc[0] >= 7 && desc[0] >= 7 + desc[6]) {
+ source_ids_count = desc[6];
+ source_ids = &desc[7];
+ get_desc = &extension_unit_get_desc;
+ sources = 1;
+ }
+ break;
+ case UAC2_SAMPLE_RATE_CONVERTER:
+ if (desc[0] >= 5) {
+ source_id = desc[4];
+ get_desc = &src_v2_get_desc;
+ sources = 1;
+ }
+ break;
+ }
+ }
+
+ if (source_id != 0) {
+ err = snd_media_link_create(state->chip->card,
+ source_id, 0, desc[3], 0);
+ if (err < 0)
+ return err;
+ sinks = 1;
+ }
+ else if (source_ids != NULL) {
+ if (source_ids_count == 0 &&
+ source_ids + source_ids_count <= desc + desc[0])
+ source_ids_count = desc + desc[0] - source_ids;
+ for (i = 0; i < source_ids_count; i++) {
+ err = snd_media_link_create(state->chip->card,
+ source_ids[i], 0,
+ desc[3], i);
+ if (err < 0)
+ return err;
+ }
+ sinks = source_ids_count;
+ }
+
+ if (get_desc) {
+ err = snd_media_entity_create(state->chip->card, get_desc,
+ desc[3], sinks, sources,
+ (void *)desc);
+ if (err < 0)
+ return err;
+ }
+
+ return 0;
+}
+
+static int snd_usb_mixer_entities(struct mixer_build *state)
+{
+ void *p;
+ int err;
+
+ p = NULL;
+ while ((p = snd_usb_find_desc(state->mixer->hostif->extra,
+ state->mixer->hostif->extralen,
+ p, USB_DT_CS_INTERFACE)) != NULL) {
+ err = snd_usb_mixer_entity(state, p);
+ if (err < 0)
+ return err;
+ }
+ return 0;
+}
+
/*
* create mixer controls
*
@@ -1997,6 +2271,10 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
}
}
+ err = snd_usb_mixer_entities(&state);
+ if (err < 0)
+ return err;
+
p = NULL;
while ((p = snd_usb_find_csint_desc(mixer->hostif->extra, mixer->hostif->extralen,
p, UAC_OUTPUT_TERMINAL)) != NULL) {
next prev parent reply other threads:[~2012-08-27 22:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-27 22:28 [RFC PATCH 1/11] expose sound device topology information Clemens Ladisch
2012-08-27 22:29 ` [RFC PATCH 01/11] ALSA: implement MEDIA_IOC_DEVICE_INFO Clemens Ladisch
2012-09-07 2:13 ` Mark Brown
2012-09-07 7:14 ` Clemens Ladisch
2012-09-07 10:40 ` Takashi Iwai
2012-08-27 22:30 ` [RFC PATCH 02/11] ALSA: implement MEDIA_IOC_ENUM_ENTITIES Clemens Ladisch
2012-08-27 22:30 ` [RFC PATCH 03/11] ALSA: pcm: add ALSA PCM device entities Clemens Ladisch
2012-08-27 22:31 ` [RFC PATCH 04/11] ALSA: implement MEDIA_IOC_ENUM_LINKS (1) Clemens Ladisch
2012-08-27 22:31 ` [RFC PATCH 05/11] ALSA: implement MEDIA_IOC_ENUM_LINKS (2) Clemens Ladisch
2012-08-27 22:32 ` [RFC PATCH 06/11] ALSA: implement MEDIA_IOC_SETUP_LINK Clemens Ladisch
2012-08-27 22:33 ` [RFC PATCH 07/11] [media] media: add entity types for ALSA Clemens Ladisch
2012-08-27 22:33 ` [RFC PATCH 08/11] ALSA: usb-audio: implement card get_info callback Clemens Ladisch
2012-08-27 22:34 ` [RFC PATCH 09/11] ALSA: usb-audio: create PCM device entities Clemens Ladisch
2012-08-27 22:35 ` Clemens Ladisch [this message]
2012-08-27 22:36 ` [RFC PATCH 11/11] ALSA: hda-intel: implement card get_info callback Clemens Ladisch
2012-09-04 15:56 ` [RFC PATCH 1/11] expose sound device topology information Takashi Iwai
2012-09-04 18:02 ` Clemens Ladisch
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=503BF640.1030509@ladisch.de \
--to=clemens@ladisch.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.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.