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

client-node: don't check format

Browse source 
Don't check if we got a Format param to be able to set buffers,
let the implementation decide on that.
This commit is contained in:
Wim Taymans 2019-12-10 12:21:02 +01:00
parent 5a2ad084e8
commit 2c492ff71f
1 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/module-client-node/client-node.c
View file

@ -99,7 +99,6 @@ struct port {
struct spa_port_info info; struct spa_port_info info;
struct pw_properties *properties; struct pw_properties *properties;
unsigned int have_format:1;
unsigned int removed:1; unsigned int removed:1;
uint32_t n_params; uint32_t n_params;
struct spa_pod **params; struct spa_pod **params;
@ -452,19 +451,13 @@ do_update_port(struct node *this,
uint32_t i; uint32_t i;
if (change_mask & PW_CLIENT_NODE_PORT_UPDATE_PARAMS) { if (change_mask & PW_CLIENT_NODE_PORT_UPDATE_PARAMS) {
port->have_format = false;
spa_log_debug(this->log, NAME" %p: port %u update %d params", this, port->id, n_params); spa_log_debug(this->log, NAME" %p: port %u update %d params", this, port->id, n_params);
for (i = 0; i < port->n_params; i++) for (i = 0; i < port->n_params; i++)
free(port->params[i]); free(port->params[i]);
port->n_params = n_params; port->n_params = n_params;
port->params = realloc(port->params, port->n_params * sizeof(struct spa_pod *)); port->params = realloc(port->params, port->n_params * sizeof(struct spa_pod *));
for (i = 0; i < port->n_params; i++) { for (i = 0; i < port->n_params; i++) {
port->params[i] = params[i] ? spa_pod_copy(params[i]) : NULL; port->params[i] = params[i] ? spa_pod_copy(params[i]) : NULL;
if (port->params[i] && spa_pod_is_object_id(port->params[i], SPA_PARAM_Format))
port->have_format = true;
} }
} }
@ -722,12 +715,9 @@ do_port_use_buffers(struct impl *impl,
p = GET_PORT(this, direction, port_id); p = GET_PORT(this, direction, port_id);
spa_log_debug(this->log, NAME " %p: %s port %d.%d use buffers %p %u flags:%08x %d", this, spa_log_debug(this->log, NAME " %p: %s port %d.%d use buffers %p %u flags:%08x", this,
direction == SPA_DIRECTION_INPUT ? "input" : "output", direction == SPA_DIRECTION_INPUT ? "input" : "output",
port_id, mix_id, buffers, n_buffers, flags, p->have_format); port_id, mix_id, buffers, n_buffers, flags);
if (!p->have_format)
return -EIO;
if (direction == SPA_DIRECTION_OUTPUT) if (direction == SPA_DIRECTION_OUTPUT)
mix_id = SPA_ID_INVALID; mix_id = SPA_ID_INVALID;
@ -1012,8 +1002,6 @@ static int client_node_port_buffers(void *data,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL); spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
p = GET_PORT(this, direction, port_id); p = GET_PORT(this, direction, port_id);
if (!p->have_format)
return -EIO;
if (direction == SPA_DIRECTION_OUTPUT) if (direction == SPA_DIRECTION_OUTPUT)
mix_id = SPA_ID_INVALID; mix_id = SPA_ID_INVALID;