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: use the right index for notify ports

Browse source
This commit is contained in:
Wim Taymans 2021-05-07 15:17:43 +02:00
parent 417a5779e7
commit 4d1fa14774
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,6 @@ struct ladspa_descriptor {
struct port { struct port {
struct node *node; struct node *node;
uint32_t idx;
unsigned long p; unsigned long p;
struct spa_list link_list; struct spa_list link_list;
@ -609,7 +608,6 @@ static struct port *find_port(struct node *node, const char *name, struct port p
for (i = 0; i < n_ports; i++) { for (i = 0; i < n_ports; i++) {
struct port *port = &ports[i]; struct port *port = &ports[i];
pw_log_info("%s %s", d->PortNames[port->p], name);
if (strcmp(d->PortNames[port->p], name) == 0) if (strcmp(d->PortNames[port->p], name) == 0)
return port; return port;
} }
@ -964,30 +962,26 @@ static int load_node(struct graph *graph, struct spa_json *json)
for (i = 0; i < desc->n_input; i++) { for (i = 0; i < desc->n_input; i++) {
struct port *port = &node->input_port[i]; struct port *port = &node->input_port[i];
port->node = node; port->node = node;
port->idx = i;
port->p = desc->input[i]; port->p = desc->input[i];
spa_list_init(&port->link_list); spa_list_init(&port->link_list);
} }
for (i = 0; i < desc->n_output; i++) { for (i = 0; i < desc->n_output; i++) {
struct port *port = &node->output_port[i]; struct port *port = &node->output_port[i];
port->node = node; port->node = node;
port->idx = i;
port->p = desc->output[i]; port->p = desc->output[i];
spa_list_init(&port->link_list); spa_list_init(&port->link_list);
} }
for (i = 0; i < desc->n_control; i++) { for (i = 0; i < desc->n_control; i++) {
struct port *port = &node->control_port[i]; struct port *port = &node->control_port[i];
port->node = node; port->node = node;
port->idx = i;
port->p = desc->control[i]; port->p = desc->control[i];
spa_list_init(&port->link_list); spa_list_init(&port->link_list);
port->control_data = desc->default_control[i]; port->control_data = desc->default_control[i];
} }
for (i = 0; i < desc->n_notify; i++) { for (i = 0; i < desc->n_notify; i++) {
struct port *port = &node->notify_port[i]; struct port *port = &node->notify_port[i];
port->idx = i;
port->node = node; port->node = node;
port->p = desc->control[i]; port->p = desc->notify[i];
spa_list_init(&port->link_list); spa_list_init(&port->link_list);
} }
if (have_control) if (have_control)
@ -1137,13 +1131,11 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
} }
for (j = 0; j < desc->n_control; j++) { for (j = 0; j < desc->n_control; j++) {
port = &node->control_port[j]; port = &node->control_port[j];
p = desc->control[j]; d->connect_port(node->hndl[i], port->p, &port->control_data);
d->connect_port(node->hndl[i], p, &port->control_data);
} }
for (j = 0; j < desc->n_notify; j++) { for (j = 0; j < desc->n_notify; j++) {
port = &node->control_port[j]; port = &node->notify_port[j];
p = desc->notify[j]; d->connect_port(node->hndl[i], port->p, &port->control_data);
d->connect_port(node->hndl[i], p, &port->control_data);
} }
if (d->activate) if (d->activate)
d->activate(node->hndl[i]); d->activate(node->hndl[i]);
@ -1161,6 +1153,8 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
desc = first->desc; desc = first->desc;
d = desc->desc; d = desc->desc;
for (j = 0; j < desc->n_input; j++) { for (j = 0; j < desc->n_input; j++) {
pw_log_info("input port %s[%d]:%s",
first->name, i, d->PortNames[desc->input[j]]);
graph->in_desc[graph->n_input] = d; graph->in_desc[graph->n_input] = d;
graph->in_hndl[graph->n_input] = first->hndl[i]; graph->in_hndl[graph->n_input] = first->hndl[i];
graph->in_port[graph->n_input] = desc->input[j]; graph->in_port[graph->n_input] = desc->input[j];
@ -1176,9 +1170,11 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
} }
desc = port->node->desc; desc = port->node->desc;
d = desc->desc; d = desc->desc;
pw_log_info("input port %s[%d]:%s",
port->node->name, i, d->PortNames[port->p]);
graph->in_desc[graph->n_input] = d; graph->in_desc[graph->n_input] = d;
graph->in_hndl[graph->n_input] = port->node->hndl[i]; graph->in_hndl[graph->n_input] = port->node->hndl[i];
graph->in_port[graph->n_input] = desc->input[port->idx]; graph->in_port[graph->n_input] = port->p;
graph->n_input++; graph->n_input++;
} }
} }
@ -1186,6 +1182,8 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
desc = last->desc; desc = last->desc;
d = desc->desc; d = desc->desc;
for (j = 0; j < desc->n_output; j++) { for (j = 0; j < desc->n_output; j++) {
pw_log_info("output port %s[%d]:%s",
last->name, i, d->PortNames[desc->output[j]]);
graph->out_desc[graph->n_output] = d; graph->out_desc[graph->n_output] = d;
graph->out_hndl[graph->n_output] = last->hndl[i]; graph->out_hndl[graph->n_output] = last->hndl[i];
graph->out_port[graph->n_output] = desc->output[j]; graph->out_port[graph->n_output] = desc->output[j];
@ -1201,10 +1199,11 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
} }
desc = port->node->desc; desc = port->node->desc;
d = desc->desc; d = desc->desc;
pw_log_info("output port %s[%d]:%s",
port->node->name, i, d->PortNames[port->p]);
graph->out_desc[graph->n_output] = d; graph->out_desc[graph->n_output] = d;
graph->out_hndl[graph->n_output] = port->node->hndl[i]; graph->out_hndl[graph->n_output] = port->node->hndl[i];
graph->out_port[graph->n_output] = desc->output[port->idx]; graph->out_port[graph->n_output] = port->p;
graph->n_output++; graph->n_output++;
} }