mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

link: renegotiate when no format set

Browse source 
When the port has lost the format, renegotiate.
This commit is contained in:
Wim Taymans 2018-10-17 10:40:03 +02:00
parent d27674722a
commit 4b4f85afe5
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/pipewire/link.c
View file

@ -210,16 +210,22 @@ static int do_negotiate(struct pw_link *this, uint32_t in_state, uint32_t out_st
if (out_state > PW_PORT_STATE_CONFIGURE && output->node->info.state == PW_NODE_STATE_IDLE) {
index = 0;
if ((res = spa_node_port_enum_params(output->node->node,
res = spa_node_port_enum_params(output->node->node,
output->direction, output->port_id,
SPA_PARAM_Format, &index,
NULL, &current, &b)) <= 0) {
if (res == 0)
res = -EBADF;
NULL, &current, &b);
switch (res) {
case -EIO:
current = NULL;
res = 0;
break;
case 0:
res = -EBADF;
default:
asprintf(&error, "error get output format: %s", spa_strerror(res));
goto error;
}
if (spa_pod_compare(current, format) != 0) {
if (current == NULL || spa_pod_compare(current, format) != 0) {
pw_log_debug("link %p: output format change, renegotiate", this);
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG)) {
spa_debug_format(2, NULL, current);
@ -235,16 +241,22 @@ static int do_negotiate(struct pw_link *this, uint32_t in_state, uint32_t out_st
}
if (in_state > PW_PORT_STATE_CONFIGURE && input->node->info.state == PW_NODE_STATE_IDLE) {
index = 0;
if ((res = spa_node_port_enum_params(input->node->node,
res = spa_node_port_enum_params(input->node->node,
input->direction, input->port_id,
SPA_PARAM_Format, &index,
NULL, &current, &b)) <= 0) {
if (res == 0)
res = -EBADF;
NULL, &current, &b);
switch (res) {
case -EIO:
current = NULL;
res = 0;
break;
case 0:
res = -EBADF;
default:
asprintf(&error, "error get input format: %s", spa_strerror(res));
goto error;
}
if (spa_pod_compare(current, format) != 0) {
if (current == NULL || spa_pod_compare(current, format) != 0) {
pw_log_debug("link %p: input format change, renegotiate", this);
pw_node_set_state(input->node, PW_NODE_STATE_SUSPENDED);
in_state = PW_PORT_STATE_CONFIGURE;