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

node: be more clever when updating ports

Browse source 
When updating the node ports, handle the case where ports are already
added as well as removed ports.
This commit is contained in:
Wim Taymans 2017-09-08 16:44:51 +02:00
parent dc85a79786
commit f03d229467
2 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pipewire/map.h
View file

@ -170,7 +170,7 @@ static inline void pw_map_for_each(struct pw_map *map, void (*func) (void *, voi
union pw_map_item *item; union pw_map_item *item;
pw_array_for_each(item, &map->items) { pw_array_for_each(item, &map->items) {
if (item->data && !pw_map_item_is_free(item)) if (!pw_map_item_is_free(item))
func(item->data, data); func(item->data, data);
} }
} }

57
src/pipewire/node.c
View file

@ -138,12 +138,52 @@ static void node_unbind_func(void *data)
spa_list_remove(&resource->link); spa_list_remove(&resource->link);
} }
static void update_port_map(struct pw_node *node, enum pw_direction direction,
struct pw_map *portmap, uint32_t *ids, uint32_t n_ids)
{
uint32_t o, n;
size_t os, ns;
struct pw_port *port;
o = n = 0;
os = pw_map_get_size(portmap);
ns = n_ids;
while (o < os || n < ns) {
port = pw_map_lookup(portmap, o);
if (n >= ns || o < ids[n]) {
pw_log_debug("node %p: %s port removed %d", node,
pw_direction_as_string(direction), o);
if (port != NULL)
pw_port_destroy(port);
o++;
}
else if (o >= os || (n < ns && o > ids[n])) {
pw_log_debug("node %p: %s port added %d", node,
pw_direction_as_string(direction), ids[n]);
if (port == NULL)
if ((port = pw_port_new(direction, ids[n], NULL, 0)))
pw_port_add(port, node);
n++;
}
else {
pw_log_debug("node %p: %s port unchanged %d", node,
pw_direction_as_string(direction), ids[n]);
n++;
o++;
}
}
}
static int update_port_ids(struct pw_node *node) static int update_port_ids(struct pw_node *node)
{ {
uint32_t *input_port_ids, *output_port_ids; uint32_t *input_port_ids, *output_port_ids;
uint32_t n_input_ports, n_output_ports, max_input_ports, max_output_ports; uint32_t n_input_ports, n_output_ports, max_input_ports, max_output_ports;
struct pw_port *port;
uint32_t i;
int res; int res;
res = spa_node_get_n_ports(node->node, res = spa_node_get_n_ports(node->node,
@ -177,16 +217,9 @@ static int update_port_ids(struct pw_node *node)
pw_log_debug("node %p: update_port ids %u/%u, %u/%u", node, pw_log_debug("node %p: update_port ids %u/%u, %u/%u", node,
n_input_ports, max_input_ports, n_output_ports, max_output_ports); n_input_ports, max_input_ports, n_output_ports, max_output_ports);
for (i = 0; i < n_input_ports; i++) { update_port_map(node, PW_DIRECTION_INPUT, &node->input_port_map, input_port_ids, n_input_ports);
pw_log_debug("node %p: input port added %d", node, input_port_ids[i]); update_port_map(node, PW_DIRECTION_OUTPUT, &node->output_port_map, output_port_ids, n_output_ports);
if ((port = pw_port_new(PW_DIRECTION_INPUT, input_port_ids[i], NULL, 0)))
pw_port_add(port, node);
}
for (i = 0; i < n_output_ports; i++) {
pw_log_debug("node %p: output port added %d", node, output_port_ids[i]);
if ((port = pw_port_new(PW_DIRECTION_OUTPUT, output_port_ids[i], NULL, 0)))
pw_port_add(port, node);
}
return SPA_RESULT_OK; return SPA_RESULT_OK;
} }