mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-01 07:15:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

impl-link: pass error codes in link error state

Browse source 
Pass the error code when setting the link in the error state.

Add some more debug.
This commit is contained in:
Wim Taymans 2025-10-15 11:20:01 +02:00
parent 9b507d3210
commit f91aed5eeb
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/pipewire/impl-client.c
View file

@ -139,7 +139,8 @@ static int client_error(void *object, uint32_t id, int res, const char *error)
goto error_no_id; goto error_no_id;
} }
pw_log_debug("%p: sender %p: error for global %u", client, sender, id); pw_log_debug("%p: sender %p: error for global %u: %s (%d)",
client, sender, id, error, res);
pw_map_for_each(&client->objects, error_resource, &d); pw_map_for_each(&client->objects, error_resource, &d);
return 0; return 0;

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

@ -104,8 +104,8 @@ static void link_update_state(struct pw_impl_link *link, enum pw_link_state stat
pw_link_state_as_string(state), error); pw_link_state_as_string(state), error);
if (state == PW_LINK_STATE_ERROR) { if (state == PW_LINK_STATE_ERROR) {
pw_log_error("(%s) %s -> error (%s) (%s-%s)", link->name, pw_log_error("(%s) %s -> error %s (%d) (%s-%s)", link->name,
pw_link_state_as_string(old), error, pw_link_state_as_string(old), error, res,
pw_impl_port_state_as_string(link->output->state), pw_impl_port_state_as_string(link->output->state),
pw_impl_port_state_as_string(link->input->state)); pw_impl_port_state_as_string(link->input->state));
} else { } else {
@ -174,7 +174,7 @@ static void complete_ready(void *obj, void *data, int res, uint32_t id)
this->output->state >= PW_IMPL_PORT_STATE_READY) this->output->state >= PW_IMPL_PORT_STATE_READY)
link_update_state(this, PW_LINK_STATE_ALLOCATING, 0, NULL); link_update_state(this, PW_LINK_STATE_ALLOCATING, 0, NULL);
} else { } else {
link_update_state(this, PW_LINK_STATE_ERROR, -EIO, strdup("Format negotiation failed")); link_update_state(this, PW_LINK_STATE_ERROR, res, strdup("Format negotiation failed"));
} }
} }
@ -192,8 +192,8 @@ static void complete_paused(void *obj, void *data, int res, uint32_t id)
return; return;
} }
pw_log_debug("%p: obj:%p port %p complete state:%d: %s", this, obj, port, pw_log_debug("%p: obj:%p port %p complete state:%d: %s (%d)", this, obj, port,
port->state, spa_strerror(res)); port->state, spa_strerror(res), res);
if (SPA_RESULT_IS_OK(res)) { if (SPA_RESULT_IS_OK(res)) {
if (port->state < PW_IMPL_PORT_STATE_PAUSED) if (port->state < PW_IMPL_PORT_STATE_PAUSED)
@ -205,7 +205,7 @@ static void complete_paused(void *obj, void *data, int res, uint32_t id)
link_update_state(this, PW_LINK_STATE_PAUSED, 0, NULL); link_update_state(this, PW_LINK_STATE_PAUSED, 0, NULL);
} else { } else {
mix->have_buffers = false; mix->have_buffers = false;
link_update_state(this, PW_LINK_STATE_ERROR, -EIO, strdup("Buffer allocation failed")); link_update_state(this, PW_LINK_STATE_ERROR, res, strdup("Buffer allocation failed"));
} }
} }