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: prepare link only between active nodes

Browse source 
We only ever want to prepare a link between active nodes so add the
check in the _prepare() functions instead. This also makes it skip
the prepare step for inactive nodes when recalculating the graph.
This commit is contained in:
Wim Taymans 2021-07-29 16:33:00 +02:00
parent 2dabd337dc
commit 158c23b2fd
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -673,7 +673,12 @@ int pw_impl_link_prepare(struct pw_impl_link *this)
{ {
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this); struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
pw_log_debug(NAME" %p: prepare prepared:%d busy:%d", this, this->prepared, this->preparing); pw_log_debug(NAME" %p: prepare prepared:%d busy:%d in_active:%d out_active:%d",
this, this->prepared, this->preparing,
impl->inode->active, impl->onode->active);
if (!impl->inode->active || !impl->onode->active)
return 0;
if (this->preparing || this->prepared) if (this->preparing || this->prepared)
return 0; return 0;
@ -903,19 +908,10 @@ static void output_node_result(void *data, int seq, int res, uint32_t type, cons
node_result(impl, port, seq, res, type, result); node_result(impl, port, seq, res, type, result);
} }
static void check_prepare(struct pw_impl_link *this)
{
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
pw_log_debug(NAME" %p: input active:%d output active:%d", impl,
impl->inode->active, impl->onode->active);
if (impl->inode->active && impl->onode->active)
pw_impl_link_prepare(this);
}
static void node_active_changed(void *data, bool active) static void node_active_changed(void *data, bool active)
{ {
struct impl *impl = data; struct impl *impl = data;
check_prepare(&impl->this); pw_impl_link_prepare(&impl->this);
} }
static const struct pw_impl_node_events input_node_events = { static const struct pw_impl_node_events input_node_events = {
@ -1287,7 +1283,7 @@ int pw_impl_link_register(struct pw_impl_link *link,
pw_global_add_listener(link->global, &link->global_listener, &global_events, link); pw_global_add_listener(link->global, &link->global_listener, &global_events, link);
pw_global_register(link->global); pw_global_register(link->global);
check_prepare(link); pw_impl_link_prepare(link);
return 0; return 0;