mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: don't set audio profile on non-audio nodes

Browse source
This commit is contained in:
Wim Taymans 2018-12-13 17:18:37 +01:00
parent a331779a28
commit 3ab95f66f3
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -885,11 +885,13 @@ static int link_nodes(struct node *peer, enum pw_direction direction, struct nod
struct impl *impl = peer->obj.impl; struct impl *impl = peer->obj.impl;
struct port *p; struct port *p;
pw_log_debug(NAME " %p: link nodes %d %d", impl, node->obj.id, peer->obj.id); pw_log_debug(NAME " %p: link nodes %d %d %d", impl, max, node->obj.id, peer->obj.id);
spa_list_for_each(p, &peer->port_list, l) { spa_list_for_each(p, &peer->port_list, l) {
struct pw_properties *props; struct pw_properties *props;
pw_log_debug(NAME " %p: port %p: %d %d", impl, p, p->direction, p->flags);
if (p->direction == direction) if (p->direction == direction)
continue; continue;
if (p->flags & PORT_FLAG_SKIP) if (p->flags & PORT_FLAG_SKIP)
@ -1083,9 +1085,13 @@ static int rescan_node(struct impl *impl, struct node *node)
n_links = 1; n_links = 1;
peer = find_object(impl, find.path_id); peer = find_object(impl, find.path_id);
if (peer != NULL && peer->obj.type == PW_TYPE_INTERFACE_Node) if (peer != NULL && peer->obj.type == PW_TYPE_INTERFACE_Node) {
if (peer->media_type == SPA_MEDIA_TYPE_audio)
goto do_link_profile;
else
goto do_link; goto do_link;
} }
}
if (find.sess == NULL) { if (find.sess == NULL) {
struct client *client; struct client *client;
@ -1130,7 +1136,7 @@ static int rescan_node(struct impl *impl, struct node *node)
spa_list_append(&session->node_list, &node->session_link); spa_list_append(&session->node_list, &node->session_link);
if (!exclusive && session->dsp) { if (!exclusive && session->dsp) {
do_link: do_link_profile:
audio_info = peer->profile_format; audio_info = peer->profile_format;
if (direction == PW_DIRECTION_INPUT) if (direction == PW_DIRECTION_INPUT)
audio_info.channels = SPA_MIN(peer->format.channels, node->format.channels); audio_info.channels = SPA_MIN(peer->format.channels, node->format.channels);
@ -1158,6 +1164,7 @@ do_link:
} else { } else {
n_links = audio_info.channels = 1; n_links = audio_info.channels = 1;
} }
do_link:
link_nodes(peer, direction, node, n_links); link_nodes(peer, direction, node, n_links);
return 1; return 1;