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: handle port states going backwards

Browse source 
When the port state goes backwards (like when suspended) update
the link state accordingly.
This commit is contained in:
Wim Taymans 2021-08-02 17:28:16 +02:00
parent 7d9dde0a1d
commit 57cbd2e963
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -673,7 +673,7 @@ 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 in_active:%d out_active:%d", pw_log_debug(NAME" %p: prepared:%d preparing:%d in_active:%d out_active:%d",
this, this->prepared, this->preparing, this, this->prepared, this->preparing,
impl->inode->active, impl->onode->active); impl->inode->active, impl->onode->active);
@ -771,10 +771,12 @@ error_resource:
return -errno; return -errno;
} }
static void port_state_changed(struct pw_impl_link *this, struct pw_impl_port *port, struct pw_impl_port *other, static void port_state_changed(struct pw_impl_link *this, struct pw_impl_port *port,
struct pw_impl_port *other, enum pw_impl_port_state old,
enum pw_impl_port_state state, const char *error) enum pw_impl_port_state state, const char *error)
{ {
pw_log_debug(NAME" %p: port %p state %d", this, port, state); pw_log_debug(NAME" %p: port %p old:%d -> state:%d prepared:%d preparing:%d",
this, port, old, state, this->prepared, this->preparing);
switch (state) { switch (state) {
case PW_IMPL_PORT_STATE_ERROR: case PW_IMPL_PORT_STATE_ERROR:
@ -782,13 +784,13 @@ static void port_state_changed(struct pw_impl_link *this, struct pw_impl_port *p
break; break;
case PW_IMPL_PORT_STATE_INIT: case PW_IMPL_PORT_STATE_INIT:
case PW_IMPL_PORT_STATE_CONFIGURE: case PW_IMPL_PORT_STATE_CONFIGURE:
if (this->prepared) { if (this->prepared || state < old) {
this->prepared = false; this->prepared = false;
link_update_state(this, PW_LINK_STATE_INIT, 0, NULL); link_update_state(this, PW_LINK_STATE_INIT, 0, NULL);
} }
break; break;
case PW_IMPL_PORT_STATE_READY: case PW_IMPL_PORT_STATE_READY:
if (this->prepared) { if (this->prepared || state < old) {
this->prepared = false; this->prepared = false;
link_update_state(this, PW_LINK_STATE_NEGOTIATING, 0, NULL); link_update_state(this, PW_LINK_STATE_NEGOTIATING, 0, NULL);
} }
@ -835,7 +837,7 @@ static void input_port_state_changed(void *data, enum pw_impl_port_state old,
{ {
struct impl *impl = data; struct impl *impl = data;
struct pw_impl_link *this = &impl->this; struct pw_impl_link *this = &impl->this;
port_state_changed(this, this->input, this->output, state, error); port_state_changed(this, this->input, this->output, old, state, error);
} }
static void output_port_param_changed(void *data, uint32_t id) static void output_port_param_changed(void *data, uint32_t id)
@ -850,7 +852,7 @@ static void output_port_state_changed(void *data, enum pw_impl_port_state old,
{ {
struct impl *impl = data; struct impl *impl = data;
struct pw_impl_link *this = &impl->this; struct pw_impl_link *this = &impl->this;
port_state_changed(this, this->output, this->input, state, error); port_state_changed(this, this->output, this->input, old, state, error);
} }
static void input_port_latency_changed(void *data) static void input_port_latency_changed(void *data)