mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-stream: improve debug

Browse source
This commit is contained in:
Wim Taymans 2018-06-15 11:29:38 +02:00
parent 0c359a6819
commit ba0a68aab3
1 changed files with 65 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/modules/module-client-node/client-stream.c
View file

@ -140,8 +140,10 @@ static int impl_node_send_command(struct spa_node *node, const struct spa_comman
if ((res = spa_node_send_command(impl->adapter, command)) < 0) if ((res = spa_node_send_command(impl->adapter, command)) < 0)
return res; return res;
if ((res = spa_node_send_command(impl->cnode, command)) < 0) if (impl->adapter != impl->cnode) {
return res; if ((res = spa_node_send_command(impl->cnode, command)) < 0)
return res;
}
return 0; return 0;
} }
@ -337,6 +339,44 @@ impl_node_port_enum_params(struct spa_node *node,
index, filter, result, builder); index, filter, result, builder);
} }
static int debug_params(struct impl *impl, struct spa_node *node,
enum spa_direction direction, uint32_t port_id, uint32_t id, struct spa_pod *filter)
{
struct node *this = &impl->node;
struct pw_type *t = impl->t;
struct spa_pod_builder b = { 0 };
uint8_t buffer[4096];
uint32_t state, flag;
struct spa_pod *format;
int res;
flag = 0;
if (id == t->param.idEnumFormat)
flag |= SPA_DEBUG_FLAG_FORMAT;
spa_log_error(this->log, "formats:");
state = 0;
while (true) {
spa_pod_builder_init(&b, buffer, sizeof(buffer));
res = spa_node_port_enum_params(node,
direction, port_id,
id, &state,
NULL, &format, &b);
if (res <= 0)
break;
spa_debug_pod(format, flag);
}
spa_log_error(this->log, "failed filter:");
if (filter)
spa_debug_pod(filter, flag);
return 0;
}
static int negotiate_format(struct impl *impl) static int negotiate_format(struct impl *impl)
{ {
struct node *this = &impl->node; struct node *this = &impl->node;
@ -353,19 +393,26 @@ static int negotiate_format(struct impl *impl)
state = 0; state = 0;
if ((res = spa_node_port_enum_params(impl->adapter, if ((res = spa_node_port_enum_params(impl->adapter,
SPA_DIRECTION_INPUT, 0, SPA_DIRECTION_INPUT, 0,
t->param.idEnumFormat, &state, t->param.idEnumFormat, &state,
NULL, &format, &b)) <= 0) NULL, &format, &b)) <= 0) {
debug_params(impl, impl->adapter, SPA_DIRECTION_INPUT, 0,
t->param.idEnumFormat, NULL);
return -ENOTSUP; return -ENOTSUP;
}
state = 0; state = 0;
if ((res = spa_node_port_enum_params(impl->cnode, if ((res = spa_node_port_enum_params(impl->cnode,
SPA_DIRECTION_OUTPUT, 0, SPA_DIRECTION_OUTPUT, 0,
t->param.idEnumFormat, &state, t->param.idEnumFormat, &state,
format, &format, &b)) <= 0) format, &format, &b)) <= 0) {
return -ENOTSUP; debug_params(impl, impl->cnode, SPA_DIRECTION_OUTPUT, 0,
t->param.idEnumFormat, format);
return -ENOTSUP;
}
spa_pod_fixate(format); spa_pod_fixate(format);
spa_debug_pod(format, SPA_DEBUG_FLAG_FORMAT);
if ((res = spa_node_port_set_param(impl->adapter, if ((res = spa_node_port_set_param(impl->adapter,
SPA_DIRECTION_INPUT, 0, SPA_DIRECTION_INPUT, 0,
@ -408,8 +455,11 @@ static int negotiate_buffers(struct impl *impl)
if ((res = spa_node_port_enum_params(impl->cnode, if ((res = spa_node_port_enum_params(impl->cnode,
SPA_DIRECTION_OUTPUT, 0, SPA_DIRECTION_OUTPUT, 0,
t->param.idBuffers, &state, t->param.idBuffers, &state,
param, &param, &b)) < 0) param, &param, &b)) < 0) {
debug_params(impl, impl->cnode, SPA_DIRECTION_OUTPUT, 0,
t->param.idBuffers, param);
return res; return res;
}
if (res == 0) if (res == 0)
param = NULL; param = NULL;
@ -418,8 +468,11 @@ static int negotiate_buffers(struct impl *impl)
if ((res = spa_node_port_enum_params(impl->adapter, if ((res = spa_node_port_enum_params(impl->adapter,
SPA_DIRECTION_INPUT, 0, SPA_DIRECTION_INPUT, 0,
t->param.idBuffers, &state, t->param.idBuffers, &state,
param, &param, &b)) <= 0) param, &param, &b)) <= 0) {
debug_params(impl, impl->adapter, SPA_DIRECTION_INPUT, 0,
t->param.idBuffers, param);
return -ENOTSUP; return -ENOTSUP;
}
spa_pod_fixate(param); spa_pod_fixate(param);
@ -450,6 +503,9 @@ static int negotiate_buffers(struct impl *impl)
NULL) < 0) NULL) < 0)
return -EINVAL; return -EINVAL;
spa_log_debug(this->log, "%p: buffers %d, blocks %d, size %d, align %d",
impl, buffers, blocks, size, align);
datas = alloca(sizeof(struct spa_data) * blocks); datas = alloca(sizeof(struct spa_data) * blocks);
memset(datas, 0, sizeof(struct spa_data) * blocks); memset(datas, 0, sizeof(struct spa_data) * blocks);
aligns = alloca(sizeof(uint32_t) * blocks); aligns = alloca(sizeof(uint32_t) * blocks);