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

filter-chain: first create instances and then link port

Browse source 
First make instances of all the plugins and then try to link them up.

Otherwise, depending on the order the plugins are defined in the config,
a link will try to create port data and set it on the instance, which is
still NULL and we crash.
This commit is contained in:
Wim Taymans 2024-10-24 10:55:50 +02:00
parent 7be69f38d8
commit 42b994204d
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/module-filter-chain.c
View file

@ -2433,19 +2433,12 @@ static int graph_instantiate(struct graph *graph)
graph->instantiated = true; graph->instantiated = true;
/* first make instances */
spa_list_for_each(node, &graph->node_list, link) { spa_list_for_each(node, &graph->node_list, link) {
node_cleanup(node); node_cleanup(node);
desc = node->desc; desc = node->desc;
d = desc->desc; d = desc->desc;
if (d->flags & FC_DESCRIPTOR_SUPPORTS_NULL_DATA) {
sd = dd = NULL;
}
else {
sd = impl->silence_data;
dd = impl->discard_data;
}
for (i = 0; i < node->n_hndl; i++) { for (i = 0; i < node->n_hndl; i++) {
pw_log_info("instantiate %s %s[%d] rate:%lu", d->name, node->name, i, impl->rate); pw_log_info("instantiate %s %s[%d] rate:%lu", d->name, node->name, i, impl->rate);
@ -2455,6 +2448,21 @@ static int graph_instantiate(struct graph *graph)
res = -errno; res = -errno;
goto error; goto error;
} }
}
}
/* then link ports and activate */
spa_list_for_each(node, &graph->node_list, link) {
desc = node->desc;
d = desc->desc;
if (d->flags & FC_DESCRIPTOR_SUPPORTS_NULL_DATA) {
sd = dd = NULL;
}
else {
sd = impl->silence_data;
dd = impl->discard_data;
}
for (i = 0; i < node->n_hndl; i++) {
for (j = 0; j < desc->n_input; j++) { for (j = 0; j < desc->n_input; j++) {
port = &node->input_port[j]; port = &node->input_port[j];
d->connect_port(node->hndl[i], port->p, sd); d->connect_port(node->hndl[i], port->p, sd);