mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-07 13:30:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

filter-chain: check external ports only once

Browse source 
When we duplicate the pipeline to match the channels, only check
if a port was used only once for the first instance. Makes
demonic filter work again.
This commit is contained in:
Wim Taymans 2021-05-20 11:22:04 +02:00
parent 9af86b7b76
commit 6df32666b4
1 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -972,16 +972,6 @@ static int parse_link(struct graph *graph, struct spa_json *json)
pw_log_error("unknown input port %s", input); pw_log_error("unknown input port %s", input);
return -ENOENT; return -ENOENT;
} }
if (in_port->external != SPA_ID_INVALID) {
pw_log_info("%s already used as graph input %d, use mixer",
input, in_port->external);
return -EINVAL;
}
if (out_port->external != SPA_ID_INVALID) {
pw_log_info("%s already used as graph output %d, use copy",
output, out_port->external);
return -EINVAL;
}
if (in_port->n_links > 0) { if (in_port->n_links > 0) {
pw_log_info("Can't have more than 1 link to %s, use a mixer", input); pw_log_info("Can't have more than 1 link to %s, use a mixer", input);
return -ENOTSUP; return -ENOTSUP;
@ -1334,10 +1324,10 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
} else { } else {
desc = port->node->desc; desc = port->node->desc;
d = desc->desc; d = desc->desc;
if (port->external != SPA_ID_INVALID) { if (i == 0 && port->external != SPA_ID_INVALID) {
pw_log_error("input port %s[%d]:%s already used as input %d, use mixer", pw_log_error("input port %s[%d]:%s already used as input %d, use mixer",
port->node->name, i, d->PortNames[port->p], port->node->name, i, d->PortNames[port->p],
graph->n_input); port->external);
res = -EBUSY; res = -EBUSY;
goto error; goto error;
} }
@ -1382,10 +1372,10 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
} else { } else {
desc = port->node->desc; desc = port->node->desc;
d = desc->desc; d = desc->desc;
if (port->external != SPA_ID_INVALID) { if (i == 0 && port->external != SPA_ID_INVALID) {
pw_log_error("output port %s[%d]:%s already used as output %d, use copy", pw_log_error("output port %s[%d]:%s already used as output %d, use copy",
port->node->name, i, d->PortNames[port->p], port->node->name, i, d->PortNames[port->p],
graph->n_output); port->external);
res = -EBUSY; res = -EBUSY;
goto error; goto error;
} }