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

core: small cleanup in _find_format()

Browse source
This commit is contained in:
Wim Taymans 2019-05-17 12:37:25 +02:00
parent 1c8daa4a50
commit abaf40ba8b
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/pipewire/core.c
View file

@ -760,6 +760,9 @@ int pw_core_find_format(struct pw_core *core,
int res; int res;
uint32_t iidx = 0, oidx = 0; uint32_t iidx = 0, oidx = 0;
struct pw_type *t = &core->type; struct pw_type *t = &core->type;
struct spa_pod_builder fb = { 0 };
uint8_t fbuf[4096];
struct spa_pod *filter;
out_state = output->state; out_state = output->state;
in_state = input->state; in_state = input->state;
@ -773,55 +776,46 @@ int pw_core_find_format(struct pw_core *core,
in_state = PW_PORT_STATE_CONFIGURE; in_state = PW_PORT_STATE_CONFIGURE;
if (in_state == PW_PORT_STATE_CONFIGURE && out_state > PW_PORT_STATE_CONFIGURE) { if (in_state == PW_PORT_STATE_CONFIGURE && out_state > PW_PORT_STATE_CONFIGURE) {
struct spa_pod_builder fb = { 0 };
uint8_t fbuf[4096];
struct spa_pod *dummy;
spa_pod_builder_init(&fb, fbuf, sizeof(fbuf)); spa_pod_builder_init(&fb, fbuf, sizeof(fbuf));
if ((res = spa_node_port_enum_params(output->node->node, if ((res = spa_node_port_enum_params(output->node->node,
output->spa_direction, output->port_id, output->spa_direction, output->port_id,
t->param.idFormat, &oidx, t->param.idFormat, &oidx,
NULL, format, &fb)) <= 0) { NULL, &filter, &fb)) <= 0) {
asprintf(error, "error get output format: %s", spa_strerror(res)); asprintf(error, "error get output format: %s", spa_strerror(res));
goto error; goto error;
} }
pw_log_debug("Got output %d format:", oidx); pw_log_debug("Got output %d format:", oidx);
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG)) if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_format(2, core->type.map, *format); spa_debug_format(2, core->type.map, filter);
if ((res = spa_node_port_enum_params(input->node->node, if ((res = spa_node_port_enum_params(input->node->node,
input->spa_direction, input->port_id, input->spa_direction, input->port_id,
t->param.idEnumFormat, &iidx, t->param.idEnumFormat, &iidx,
*format, &dummy, builder)) <= 0) { filter, format, builder)) <= 0) {
asprintf(error, "error input enum formats: %d", res); asprintf(error, "error input enum formats: %d", res);
goto error; goto error;
} }
} else if (out_state == PW_PORT_STATE_CONFIGURE && in_state > PW_PORT_STATE_CONFIGURE) { } else if (out_state == PW_PORT_STATE_CONFIGURE && in_state > PW_PORT_STATE_CONFIGURE) {
struct spa_pod_builder fb = { 0 };
uint8_t fbuf[4096];
struct spa_pod *dummy;
spa_pod_builder_init(&fb, fbuf, sizeof(fbuf)); spa_pod_builder_init(&fb, fbuf, sizeof(fbuf));
if ((res = spa_node_port_enum_params(input->node->node, if ((res = spa_node_port_enum_params(input->node->node,
input->spa_direction, input->port_id, input->spa_direction, input->port_id,
t->param.idFormat, &iidx, t->param.idFormat, &iidx,
NULL, format, &fb)) <= 0) { NULL, &filter, &fb)) <= 0) {
asprintf(error, "error get input format: %s", spa_strerror(res)); asprintf(error, "error get input format: %s", spa_strerror(res));
goto error; goto error;
} }
pw_log_debug("Got input %d format:", oidx); pw_log_debug("Got input %d format:", iidx);
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG)) if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_format(2, core->type.map, *format); spa_debug_format(2, core->type.map, filter);
if ((res = spa_node_port_enum_params(output->node->node, if ((res = spa_node_port_enum_params(output->node->node,
output->spa_direction, output->port_id, output->spa_direction, output->port_id,
t->param.idEnumFormat, &oidx, t->param.idEnumFormat, &oidx,
*format, &dummy, builder)) <= 0) { filter, format, builder)) <= 0) {
asprintf(error, "error output enum formats: %d", res); asprintf(error, "error output enum formats: %d", res);
goto error; goto error;
} }
} else if (in_state == PW_PORT_STATE_CONFIGURE && out_state == PW_PORT_STATE_CONFIGURE) { } else if (in_state == PW_PORT_STATE_CONFIGURE && out_state == PW_PORT_STATE_CONFIGURE) {
struct spa_pod_builder fb = { 0 };
uint8_t fbuf[4096];
struct spa_pod *filter;
again: again:
/* both ports need a format */ /* both ports need a format */
pw_log_debug("core %p: do enum input %d", core, iidx); pw_log_debug("core %p: do enum input %d", core, iidx);