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

context: Don't stop setting runnable when meeting the driving node

Browse source 
Start scanning from a non-driving runnable node in one direction and set
all linked intermedia nodes runnable as well.

This ensure that play -> driving_sink -> effect -> sink also sets the
effect and sink nodes to running.

Fixes  #3405
This commit is contained in:
Wim Taymans 2023-08-04 17:42:04 +02:00
parent 140374d207
commit 1daae4c369
1 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/pipewire/context.c
View file

@ -787,44 +787,44 @@ static int ensure_state(struct pw_impl_node *node, bool running)
return pw_impl_node_set_state(node, state);
}
/* From a node (that is runnable) follow all prepared links and groups to
* active nodes up to the driver and make them recursively runnable as well.
*
* We stop at driver nodes so that other paths linked to the driver will stay
* unrunnable when no other runnable path exists.
/* From a node (that is runnable) follow all prepared links in the given direction
* and groups to active nodes and make them recursively runnable as well.
*/
static inline int run_nodes(struct pw_context *context, struct pw_impl_node *node, struct spa_list *nodes)
static inline int run_nodes(struct pw_context *context, struct pw_impl_node *node,
struct spa_list *nodes, enum pw_direction direction)
{
struct pw_impl_node *t;
struct pw_impl_port *p;
struct pw_impl_link *l;
pw_log_debug("node %p: '%s'", node, node->name);
pw_log_debug("node %p: '%s' direction:%s", node, node->name,
pw_direction_as_string(direction));
spa_list_for_each(p, &node->input_ports, link) {
spa_list_for_each(l, &p->links, input_link) {
t = l->output->node;
if (direction == PW_DIRECTION_INPUT) {
spa_list_for_each(p, &node->input_ports, link) {
spa_list_for_each(l, &p->links, input_link) {
t = l->output->node;
if (!t->active || !l->prepared || t->runnable)
continue;
if (!t->active || !l->prepared || (!t->driving && t->runnable))
continue;
pw_log_debug(" peer %p: '%s'", t, t->name);
t->runnable = true;
if (!t->driving)
run_nodes(context, t, nodes);
pw_log_debug(" peer %p: '%s'", t, t->name);
t->runnable = true;
run_nodes(context, t, nodes, direction);
}
}
}
spa_list_for_each(p, &node->output_ports, link) {
spa_list_for_each(l, &p->links, output_link) {
t = l->input->node;
} else {
spa_list_for_each(p, &node->output_ports, link) {
spa_list_for_each(l, &p->links, output_link) {
t = l->input->node;
if (!t->active || !l->prepared || t->runnable)
continue;
if (!t->active || !l->prepared || (!t->driving && t->runnable))
continue;
pw_log_debug(" peer %p: '%s'", t, t->name);
t->runnable = true;
if (!t->driving)
run_nodes(context, t, nodes);
pw_log_debug(" peer %p: '%s'", t, t->name);
t->runnable = true;
run_nodes(context, t, nodes, direction);
}
}
}
/* now go through all the nodes that have the same link group and
@ -842,7 +842,7 @@ static inline int run_nodes(struct pw_context *context, struct pw_impl_node *nod
pw_log_debug(" group %p: '%s'", t, t->name);
t->runnable = true;
if (!t->driving)
run_nodes(context, t, nodes);
run_nodes(context, t, nodes, direction);
}
}
return 0;
@ -944,8 +944,10 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
pw_log_debug(" next node %p: '%s' runnable:%u", n, n->name, n->runnable);
}
spa_list_for_each(n, collect, sort_link)
if (!n->driving && n->runnable)
run_nodes(context, n, collect);
if (!n->driving && n->runnable) {
run_nodes(context, n, collect, PW_DIRECTION_OUTPUT);
run_nodes(context, n, collect, PW_DIRECTION_INPUT);
}
return 0;
}