mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: handle default media roles better

Browse source 
Use the media.class to derive a better role.
This commit is contained in:
Wim Taymans 2018-10-18 12:53:30 +02:00
parent 79e976e5d7
commit fd5e315a10
1 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/examples/media-session.c
View file

@ -97,6 +97,7 @@ struct node {
#define NODE_TYPE_DSP 2 #define NODE_TYPE_DSP 2
#define NODE_TYPE_DEVICE 3 #define NODE_TYPE_DEVICE 3
uint32_t type; uint32_t type;
char *media;
struct spa_audio_info_raw format; struct spa_audio_info_raw format;
}; };
@ -340,7 +341,7 @@ static void node_event_param(void *object,
struct node *n = object; struct node *n = object;
struct impl *impl = n->obj.impl; struct impl *impl = n->obj.impl;
uint32_t media_type, media_subtype; uint32_t media_type, media_subtype;
struct spa_audio_info_raw info; struct spa_audio_info_raw info = { 0, };
pw_log_debug(NAME" %p: param for node %d", impl, n->obj.id); pw_log_debug(NAME" %p: param for node %d", impl, n->obj.id);
@ -409,6 +410,8 @@ static void node_proxy_destroy(void *data)
} }
if (n->info) if (n->info)
pw_node_info_free(n->info); pw_node_info_free(n->info);
if (n->media)
free(n->media);
if (n->session) { if (n->session) {
spa_list_remove(&n->session_link); spa_list_remove(&n->session_link);
n->session = NULL; n->session = NULL;
@ -468,15 +471,20 @@ handle_node(struct impl *impl, uint32_t id, uint32_t parent_id,
if (strstr(media_class, "Stream/") == media_class) { if (strstr(media_class, "Stream/") == media_class) {
media_class += strlen("Stream/"); media_class += strlen("Stream/");
if (strstr(media_class, "Output/") == media_class) if (strstr(media_class, "Output/") == media_class) {
direction = PW_DIRECTION_OUTPUT; direction = PW_DIRECTION_OUTPUT;
else if (strstr(media_class, "Input/") == media_class) media_class += strlen("Output/");
}
else if (strstr(media_class, "Input/") == media_class) {
direction = PW_DIRECTION_INPUT; direction = PW_DIRECTION_INPUT;
media_class += strlen("Input/");
}
else else
return 0; return 0;
node->direction = direction; node->direction = direction;
node->type = NODE_TYPE_STREAM; node->type = NODE_TYPE_STREAM;
node->media = strdup(media_class);
pw_log_debug(NAME "%p: node %d is stream", impl, id); pw_log_debug(NAME "%p: node %d is stream", impl, id);
pw_node_proxy_enum_params((struct pw_node_proxy*)p, pw_node_proxy_enum_params((struct pw_node_proxy*)p,
@ -542,7 +550,7 @@ static void port_event_param(void *object,
struct port *p = object; struct port *p = object;
struct node *node = p->node; struct node *node = p->node;
uint32_t media_type, media_subtype; uint32_t media_type, media_subtype;
struct spa_audio_info_raw info; struct spa_audio_info_raw info = { 0, };
pw_log_debug(NAME" %p: param for port %d", p->obj.impl, p->obj.id); pw_log_debug(NAME" %p: param for port %d", p->obj.impl, p->obj.id);
@ -635,7 +643,7 @@ handle_port(struct impl *impl, uint32_t id, uint32_t parent_id, uint32_t type,
0, -1, NULL); 0, -1, NULL);
} }
pw_log_debug(NAME" %p: new port %d for node %d", impl, id, parent_id); pw_log_debug(NAME" %p: new port %d for node %d type %d", impl, id, parent_id, node->type);
return 0; return 0;
} }
@ -812,7 +820,7 @@ static int rescan_node(struct impl *impl, struct node *node)
struct node *peer; struct node *peer;
enum pw_direction direction; enum pw_direction direction;
struct spa_pod_builder b = { 0, }; struct spa_pod_builder b = { 0, };
struct spa_audio_info_raw audio_info; struct spa_audio_info_raw audio_info = { 0, };
struct spa_pod *param; struct spa_pod *param;
char buf[1024]; char buf[1024];
@ -837,19 +845,37 @@ static int rescan_node(struct impl *impl, struct node *node)
} }
if ((media = spa_dict_lookup(props, PW_NODE_PROP_MEDIA)) == NULL) if ((media = spa_dict_lookup(props, PW_NODE_PROP_MEDIA)) == NULL)
media = "Audio"; media = node->media;
if ((category = spa_dict_lookup(props, PW_NODE_PROP_CATEGORY)) == NULL) { if ((category = spa_dict_lookup(props, PW_NODE_PROP_CATEGORY)) == NULL) {
if (info->n_input_ports > 0 && info->n_output_ports == 0) if (info->n_input_ports > 0 && info->n_output_ports == 0)
category = "Capture"; category = "Capture";
else if (info->n_output_ports > 0 && info->n_input_ports == 0) else if (info->n_output_ports > 0 && info->n_input_ports == 0)
category = "Playback"; category = "Playback";
else if (info->n_output_ports > 0 && info->n_input_ports > 0)
category = "Duplex";
else else
return -EINVAL; return -EINVAL;
} }
if ((role = spa_dict_lookup(props, PW_NODE_PROP_ROLE)) == NULL) if ((role = spa_dict_lookup(props, PW_NODE_PROP_ROLE)) == NULL) {
if (strcmp(media, "Audio") == 0) {
if (strcmp(category, "Duplex") == 0)
role = "Communication";
else if (strcmp(category, "Capture") == 0)
role = "Production";
else
role = "Music"; role = "Music";
}
else if (strcmp(media, "Video") == 0) {
if (strcmp(category, "Duplex") == 0)
role = "Communication";
else if (strcmp(category, "Capture") == 0)
role = "Camera";
else
role = "Video";
}
}
if ((str = spa_dict_lookup(props, PW_NODE_PROP_EXCLUSIVE)) != NULL) if ((str = spa_dict_lookup(props, PW_NODE_PROP_EXCLUSIVE)) != NULL)
exclusive = pw_properties_parse_bool(str); exclusive = pw_properties_parse_bool(str);
@ -927,7 +953,7 @@ static int rescan_node(struct impl *impl, struct node *node)
node->session = session; node->session = session;
spa_list_append(&session->node_list, &node->session_link); spa_list_append(&session->node_list, &node->session_link);
if (!exclusive) { if (!exclusive && session->dsp) {
audio_info = session->node->format; audio_info = session->node->format;
audio_info.format = SPA_AUDIO_FORMAT_F32P; audio_info.format = SPA_AUDIO_FORMAT_F32P;
audio_info.rate = session->node->format.rate; audio_info.rate = session->node->format.rate;
@ -979,7 +1005,7 @@ static void rescan_session(struct impl *impl, struct session *sess)
if (sess->need_dsp && sess->dsp == NULL && sess->dsp_proxy == NULL) { if (sess->need_dsp && sess->dsp == NULL && sess->dsp_proxy == NULL) {
struct pw_properties *props; struct pw_properties *props;
struct node *node = sess->node; struct node *node = sess->node;
struct spa_audio_info_raw info; struct spa_audio_info_raw info = { 0, };
uint8_t buf[1024]; uint8_t buf[1024];
struct spa_pod_builder b = { 0, }; struct spa_pod_builder b = { 0, };
struct spa_pod *param; struct spa_pod *param;