mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-02-25 01:40:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

impl-link: prepare a link right after creating it

Browse source 
There is no reason to delay preparing the link (by the scheduler) when
both nodes are active, we can do that right from the start.

This makes things a bit more symetrical because deactivating a node does
not unprepare a link.

This however changes things a bit because you can no longer delay link
prepare until you activate the node. I don't know if this is actually in
use and it would probably be to delay format negotiation. The right way
do delay format negotiation is to wait until an EnumFormat is set but
that is something to improve later.
This commit is contained in:
Wim Taymans 2026-02-20 10:12:27 +01:00
parent 5bd93b97ad
commit 8f3d8d77ab
3 changed files with 3 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-scheduler-v1.c
View file

@ -241,8 +241,6 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
if (!t->active)
continue;
pw_impl_link_prepare(l);
if (!l->prepared)
continue;
@ -262,8 +260,6 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
if (!t->active)
continue;
pw_impl_link_prepare(l);
if (!l->prepared)
continue;

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

@ -969,8 +969,7 @@ static void output_remove(struct pw_impl_link *this)
this->output = NULL;
}
SPA_EXPORT
int pw_impl_link_prepare(struct pw_impl_link *this)
static int link_prepare(struct pw_impl_link *this)
{
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
@ -978,9 +977,6 @@ int pw_impl_link_prepare(struct pw_impl_link *this)
this, this->prepared, this->preparing,
impl->input.node->active, impl->output.node->active, this->passive);
if (!impl->input.node->active || !impl->output.node->active)
return 0;
if (this->destroyed || this->preparing || this->prepared)
return 0;
@ -1092,7 +1088,7 @@ static void port_param_changed(struct pw_impl_link *this, uint32_t id,
pw_log_info("%p: format changed", this);
this->preparing = this->prepared = false;
link_update_state(this, PW_LINK_STATE_INIT, 0, NULL);
pw_impl_link_prepare(this);
link_prepare(this);
}
static void input_port_param_changed(void *data, uint32_t id)
@ -1220,12 +1216,6 @@ static void output_node_result(void *data, int seq, int res, uint32_t type, cons
node_result(impl, &impl->output, seq, res, type, result);
}
static void node_active_changed(void *data, bool active)
{
struct impl *impl = data;
pw_impl_link_prepare(&impl->this);
}
static void node_driver_changed(void *data, struct pw_impl_node *old, struct pw_impl_node *driver)
{
struct impl *impl = data;
@ -1240,14 +1230,12 @@ static void node_driver_changed(void *data, struct pw_impl_node *old, struct pw_
static const struct pw_impl_node_events input_node_events = {
PW_VERSION_IMPL_NODE_EVENTS,
.result = input_node_result,
.active_changed = node_active_changed,
.driver_changed = node_driver_changed,
};
static const struct pw_impl_node_events output_node_events = {
PW_VERSION_IMPL_NODE_EVENTS,
.result = output_node_result,
.active_changed = node_active_changed,
.driver_changed = node_driver_changed,
};
@ -1720,7 +1708,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_register(link->global);
pw_impl_link_prepare(link);
link_prepare(link);
return 0;

3
src/pipewire/private.h
View file

@ -1358,9 +1358,6 @@ int pw_impl_node_set_io(struct pw_impl_node *node, uint32_t id, void *data, size
int pw_impl_node_add_target(struct pw_impl_node *node, struct pw_node_target *t);
int pw_impl_node_remove_target(struct pw_impl_node *node, struct pw_node_target *t);
/** Prepare a link
* Starts the negotiation of formats and buffers on \a link */
int pw_impl_link_prepare(struct pw_impl_link *link);
/** starts streaming on a link */
int pw_impl_link_activate(struct pw_impl_link *link);