mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: set classes in the profile

Browse source 
parse classes in the pulse layer
This commit is contained in:
Wim Taymans 2020-07-01 13:39:10 +02:00
parent 03cef06dd2
commit 698509ef55
2 changed files with 59 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pipewire-pulseaudio/src/introspect.c
View file

@ -1259,9 +1259,10 @@ static void card_callback(struct card_data *d)
pw_log_debug("context %p: info for %d", g->context, g->id);
spa_list_for_each(p, &g->card_info.profiles, link) {
uint32_t id, priority = 0, available = 0;
uint32_t id, priority = 0, available = 0, n_cap = 0, n_play = 0;
const char *name = NULL;
const char *description = NULL;
struct spa_pod *classes = NULL, *iter;
if (spa_pod_parse_object(p->param,
SPA_TYPE_OBJECT_ParamProfile, NULL,
@ -1269,15 +1270,36 @@ static void card_callback(struct card_data *d)
SPA_PARAM_PROFILE_name, SPA_POD_String(&name),
SPA_PARAM_PROFILE_description, SPA_POD_OPT_String(&description),
SPA_PARAM_PROFILE_priority, SPA_POD_OPT_Int(&priority),
SPA_PARAM_PROFILE_available, SPA_POD_OPT_Id(&available)) < 0) {
SPA_PARAM_PROFILE_available, SPA_POD_OPT_Id(&available),
SPA_PARAM_PROFILE_classes, SPA_POD_OPT_Pod(&classes)) < 0) {
pw_log_warn("device %d: can't parse profile", g->id);
continue;
}
if (classes != NULL) {
SPA_POD_STRUCT_FOREACH(classes, iter) {
struct spa_pod_parser prs;
struct spa_pod_frame f[1];
char *class;
uint32_t count;
spa_pod_parser_pod(&prs, iter);
spa_pod_parser_push_struct(&prs, &f[0]);
while (spa_pod_parser_get(&prs,
SPA_POD_String(&class),
SPA_POD_Int(&count),
NULL) == 2) {
if (strcmp(class, "Audio/Sink") == 0)
n_play += count;
else if (strcmp(class, "Audio/Source") == 0)
n_cap += count;
}
spa_pod_parser_pop(&prs, &f[0]);
}
}
i->profiles[j].name = name;
i->profiles[j].description = description ? description : name;
i->profiles[j].n_sinks = 1;
i->profiles[j].n_sources = 1;
i->profiles[j].n_sinks = n_play;
i->profiles[j].n_sources = n_cap;
i->profiles[j].priority = priority;
i->profiles2[j] = alloca(sizeof(pa_card_profile_info2));

43
spa/plugins/alsa/alsa-pcm-device.c
View file

@ -70,6 +70,8 @@ struct impl {
struct props props;
uint32_t n_nodes;
uint32_t n_capture;
uint32_t n_playback;
uint32_t profile;
};
@ -166,7 +168,7 @@ static int emit_node(struct impl *this, snd_ctl_card_info_t *cardinfo, snd_pcm_i
static int activate_profile(struct impl *this, snd_ctl_t *ctl_hndl, uint32_t id)
{
int err = 0, dev;
uint32_t i;
uint32_t i, n_cap, n_play;
snd_pcm_info_t *pcminfo;
snd_ctl_card_info_t *cardinfo;
@ -182,18 +184,18 @@ static int activate_profile(struct impl *this, snd_ctl_t *ctl_hndl, uint32_t id)
for (i = 0; i < this->n_nodes; i++)
spa_device_emit_object_info(&this->hooks, i, NULL);
this->n_nodes = 0;
this->n_nodes = this->n_capture = this->n_playback = 0;
if (id == 0)
return 0;
snd_pcm_info_alloca(&pcminfo);
dev = -1;
i = 0;
i = n_cap = n_play = 0;
while (1) {
if ((err = snd_ctl_pcm_next_device(ctl_hndl, &dev)) < 0) {
spa_log_error(this->log, "error iterating devices: %s", snd_strerror(err));
goto exit;
break;
}
if (dev < 0)
break;
@ -206,19 +208,24 @@ static int activate_profile(struct impl *this, snd_ctl_t *ctl_hndl, uint32_t id)
if (err != -ENOENT)
spa_log_error(this->log, "error pcm info: %s", snd_strerror(err));
}
if (err >= 0)
if (err >= 0) {
n_play++;
emit_node(this, cardinfo, pcminfo, i++);
}
snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE);
if ((err = snd_ctl_pcm_info(ctl_hndl, pcminfo)) < 0) {
if (err != -ENOENT)
spa_log_error(this->log, "error pcm info: %s", snd_strerror(err));
}
if (err >= 0)
if (err >= 0) {
n_cap++;
emit_node(this, cardinfo, pcminfo, i++);
}
}
this->n_capture = n_cap;
this->n_playback = n_play;
this->n_nodes = i;
exit:
return err;
}
@ -356,6 +363,7 @@ static int impl_enum_params(void *object, int seq,
switch (id) {
case SPA_PARAM_EnumProfile:
{
struct spa_pod_frame f[2];
switch (result.index) {
case 0:
param = spa_pod_builder_add_object(&b,
@ -364,10 +372,25 @@ static int impl_enum_params(void *object, int seq,
SPA_PARAM_PROFILE_name, SPA_POD_String("Off"));
break;
case 1:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamProfile, id,
spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_ParamProfile, id);
spa_pod_builder_add(&b,
SPA_PARAM_PROFILE_index, SPA_POD_Int(1),
SPA_PARAM_PROFILE_name, SPA_POD_String("On"));
SPA_PARAM_PROFILE_name, SPA_POD_String("On"),
0);
spa_pod_builder_prop(&b, SPA_PARAM_PROFILE_classes, 0);
spa_pod_builder_push_struct(&b, &f[1]);
if (this->n_capture) {
spa_pod_builder_add_struct(&b,
SPA_POD_String("Audio/Source"),
SPA_POD_Int(this->n_capture));
}
if (this->n_playback) {
spa_pod_builder_add_struct(&b,
SPA_POD_String("Audio/Sink"),
SPA_POD_Int(this->n_playback));
}
spa_pod_builder_pop(&b, &f[1]);
param = spa_pod_builder_pop(&b, &f[0]);
break;
default:
return 0;