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

filter-graph: ensure we can call setup_graph multiple times

Browse source 
We need to reset the fields used for sorting so that we can run the
setup_graph code multiple times.
This commit is contained in:
Wim Taymans 2025-05-07 12:55:59 +02:00
parent a30a988606
commit 5a4e8bb45e
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
spa/plugins/filter-graph/filter-graph.c
View file

@ -116,9 +116,12 @@ struct node {
void *hndl[MAX_HNDL]; void *hndl[MAX_HNDL];
unsigned int n_deps; unsigned int n_deps;
unsigned int visited:1;
unsigned int disabled:1; unsigned int disabled:1;
unsigned int control_changed:1; unsigned int control_changed:1;
unsigned int n_sort_deps;
unsigned int sorted:1;
}; };
struct link { struct link {
@ -1627,8 +1630,8 @@ static struct node *find_next_node(struct graph *graph)
{ {
struct node *node; struct node *node;
spa_list_for_each(node, &graph->node_list, link) { spa_list_for_each(node, &graph->node_list, link) {
if (node->n_deps == 0 && !node->visited) { if (node->n_sort_deps == 0 && !node->sorted) {
node->visited = true; node->sorted = true;
return node; return node;
} }
} }
@ -1876,9 +1879,13 @@ static int setup_graph(struct graph *graph)
} }
} }
/* order all nodes based on dependencies */
graph->n_hndl = 0; graph->n_hndl = 0;
graph->hndl = calloc(graph->n_nodes * n_hndl, sizeof(struct graph_hndl)); graph->hndl = calloc(graph->n_nodes * n_hndl, sizeof(struct graph_hndl));
/* order all nodes based on dependencies, first reset fields */
spa_list_for_each(node, &graph->node_list, link) {
node->sorted = false;
node->n_sort_deps = node->n_deps;
}
while (true) { while (true) {
if ((node = find_next_node(graph)) == NULL) if ((node = find_next_node(graph)) == NULL)
break; break;
@ -1896,11 +1903,11 @@ static int setup_graph(struct graph *graph)
} }
for (i = 0; i < desc->n_output; i++) { for (i = 0; i < desc->n_output; i++) {
spa_list_for_each(link, &node->output_port[i].link_list, output_link) spa_list_for_each(link, &node->output_port[i].link_list, output_link)
link->input->node->n_deps--; link->input->node->n_sort_deps--;
} }
for (i = 0; i < desc->n_notify; i++) { for (i = 0; i < desc->n_notify; i++) {
spa_list_for_each(link, &node->notify_port[i].link_list, output_link) spa_list_for_each(link, &node->notify_port[i].link_list, output_link)
link->input->node->n_deps--; link->input->node->n_sort_deps--;
} }
for (i = 0; i < desc->n_control; i++) { for (i = 0; i < desc->n_control; i++) {
/* any default values for the controls are set in the first instance /* any default values for the controls are set in the first instance