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

audioconvert: handle invalid ports better

Browse source 
Keep track of the valid ports and don't emit port info for
invalid ports. When a listener is added while the ports are being
created, it is possible that the ports are still NULL or invalid.
This commit is contained in:
Wim Taymans 2024-02-28 11:29:01 +01:00
parent 8942b74c18
commit b41e2391bd
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
spa/plugins/audioconvert/audioconvert.c
View file

@ -151,6 +151,7 @@ struct port {
unsigned int have_latency:1; unsigned int have_latency:1;
struct spa_audio_info format; struct spa_audio_info format;
unsigned int valid:1;
unsigned int have_format:1; unsigned int have_format:1;
unsigned int is_dsp:1; unsigned int is_dsp:1;
unsigned int is_monitor:1; unsigned int is_monitor:1;
@ -370,6 +371,7 @@ static int init_port(struct impl *this, enum spa_direction direction, uint32_t p
port->blocks = 1; port->blocks = 1;
port->stride = 1; port->stride = 1;
} }
port->valid = true;
spa_list_init(&port->queue); spa_list_init(&port->queue);
spa_log_debug(this->log, "%p: add port %d:%d position:%s %d %d %d", spa_log_debug(this->log, "%p: add port %d:%d position:%s %d %d %d",
@ -380,6 +382,16 @@ static int init_port(struct impl *this, enum spa_direction direction, uint32_t p
return 0; return 0;
} }
static int deinit_port(struct impl *this, enum spa_direction direction, uint32_t port_id)
{
struct port *port = GET_PORT(this, direction, port_id);
if (port == NULL || !port->valid)
return -ENOENT;
port->valid = false;
spa_node_emit_port_info(&this->hooks, direction, port_id, NULL);
return 0;
}
static int impl_node_enum_params(void *object, int seq, static int impl_node_enum_params(void *object, int seq,
uint32_t id, uint32_t start, uint32_t num, uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter) const struct spa_pod *filter)
@ -1274,9 +1286,9 @@ static int reconfigure_mode(struct impl *this, enum spa_param_port_config_mode m
control, mode, dir->n_ports); control, mode, dir->n_ports);
for (i = 0; i < dir->n_ports; i++) { for (i = 0; i < dir->n_ports; i++) {
spa_node_emit_port_info(&this->hooks, direction, i, NULL); deinit_port(this, direction, i);
if (this->monitor && direction == SPA_DIRECTION_INPUT) if (this->monitor && direction == SPA_DIRECTION_INPUT)
spa_node_emit_port_info(&this->hooks, SPA_DIRECTION_OUTPUT, i+1, NULL); deinit_port(this, SPA_DIRECTION_OUTPUT, i+1);
} }
this->monitor = monitor; this->monitor = monitor;
@ -1934,6 +1946,7 @@ impl_node_add_listener(void *object,
struct impl *this = object; struct impl *this = object;
uint32_t i; uint32_t i;
struct spa_hook_list save; struct spa_hook_list save;
struct port *p;
spa_return_val_if_fail(this != NULL, -EINVAL); spa_return_val_if_fail(this != NULL, -EINVAL);
@ -1942,10 +1955,12 @@ impl_node_add_listener(void *object,
emit_node_info(this, true); emit_node_info(this, true);
for (i = 0; i < this->dir[SPA_DIRECTION_INPUT].n_ports; i++) { for (i = 0; i < this->dir[SPA_DIRECTION_INPUT].n_ports; i++) {
emit_port_info(this, GET_IN_PORT(this, i), true); if ((p = GET_IN_PORT(this, i)) && p->valid)
emit_port_info(this, p, true);
} }
for (i = 0; i < this->dir[SPA_DIRECTION_OUTPUT].n_ports; i++) { for (i = 0; i < this->dir[SPA_DIRECTION_OUTPUT].n_ports; i++) {
emit_port_info(this, GET_OUT_PORT(this, i), true); if ((p = GET_OUT_PORT(this, i)) && p->valid)
emit_port_info(this, p, true);
} }
spa_hook_list_join(&this->hooks, &save); spa_hook_list_join(&this->hooks, &save);