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

impl-link: fix feedback handling

Browse source 
If a link is a feedback link, we just need to swap the input/output
scheduling dependency.

Don't swap input/output nodes (without swapping ports) because then we
will be querying the wrong node/port pair when negotiating and cause
errors.

See #4706
This commit is contained in:
Wim Taymans 2025-05-19 09:45:05 +02:00
parent 9ff1c93ab1
commit b9a8bb15a4
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pipewire/impl-link.c
View file

@ -1536,14 +1536,8 @@ struct pw_impl_link *pw_context_create_link(struct pw_context *context,
impl->input.port = input; impl->input.port = input;
impl->output.port = output; impl->output.port = output;
if (this->feedback) {
impl->input.node = output_node;
impl->output.node = input_node;
}
else {
impl->output.node = output_node; impl->output.node = output_node;
impl->input.node = input_node; impl->input.node = input_node;
}
impl->input.mix = &this->rt.in_mix; impl->input.mix = &this->rt.in_mix;
impl->output.mix = &this->rt.out_mix; impl->output.mix = &this->rt.out_mix;
@ -1569,8 +1563,12 @@ struct pw_impl_link *pw_context_create_link(struct pw_context *context,
pw_impl_port_recalc_tag(output); pw_impl_port_recalc_tag(output);
pw_impl_port_recalc_tag(input); pw_impl_port_recalc_tag(input);
if (impl->output.node != impl->input.node) if (impl->output.node != impl->input.node) {
if (this->feedback)
this->peer = pw_node_peer_ref(impl->input.node, impl->output.node);
else
this->peer = pw_node_peer_ref(impl->output.node, impl->input.node); this->peer = pw_node_peer_ref(impl->output.node, impl->input.node);
}
return this; return this;