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

remote-node: don't init/release our special mix

Browse source 
We have SPA_ID_INVALID mix id for all ports to handle the formats and
buffers, we don't need to init/release the mix for this or else our
n_mix accounting is wrong and we might not clear the format right.
This commit is contained in:
Wim Taymans 2023-07-10 16:56:58 +02:00
parent 3e0050d1cd
commit 098ac51272
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/module-client-node/remote-node.c
View file

@ -39,8 +39,6 @@ struct buffer {
struct mix { struct mix {
struct spa_list link; struct spa_list link;
struct pw_impl_port *port; struct pw_impl_port *port;
uint32_t mix_id;
uint32_t peer_id;
struct pw_impl_port_mix mix; struct pw_impl_port_mix mix;
struct pw_array buffers; struct pw_array buffers;
}; };
@ -151,8 +149,9 @@ static void mix_init(struct mix *mix, struct pw_impl_port *port,
{ {
pw_log_debug("port %p: mix init %d.%d", port, port->port_id, mix_id); pw_log_debug("port %p: mix init %d.%d", port, port->port_id, mix_id);
mix->port = port; mix->port = port;
mix->mix_id = mix_id; mix->mix.id = mix_id;
mix->peer_id = peer_id; mix->mix.peer_id = peer_id;
if (mix_id != SPA_ID_INVALID)
pw_impl_port_init_mix(port, &mix->mix); pw_impl_port_init_mix(port, &mix->mix);
pw_array_init(&mix->buffers, 32); pw_array_init(&mix->buffers, 32);
pw_array_ensure_size(&mix->buffers, sizeof(struct buffer) * 64); pw_array_ensure_size(&mix->buffers, sizeof(struct buffer) * 64);
@ -165,7 +164,7 @@ static struct mix *find_mix(struct node_data *data,
spa_list_for_each(mix, &data->mix[direction], link) { spa_list_for_each(mix, &data->mix[direction], link) {
if (mix->port->port_id == port_id && if (mix->port->port_id == port_id &&
mix->mix_id == mix_id) { mix->mix.id == mix_id) {
pw_log_debug("port %p: found mix %d:%d.%d", mix->port, pw_log_debug("port %p: found mix %d:%d.%d", mix->port,
direction, port_id, mix_id); direction, port_id, mix_id);
return mix; return mix;
@ -532,7 +531,7 @@ static int clear_buffers(struct node_data *data, struct mix *mix)
pw_log_debug("port %p: clear %zd buffers mix:%d", port, pw_log_debug("port %p: clear %zd buffers mix:%d", port,
pw_array_get_len(&mix->buffers, struct buffer *), pw_array_get_len(&mix->buffers, struct buffer *),
mix->mix_id); mix->mix.id);
if ((res = pw_impl_port_use_buffers(port, &mix->mix, 0, NULL, 0)) < 0) { if ((res = pw_impl_port_use_buffers(port, &mix->mix, 0, NULL, 0)) < 0) {
pw_log_error("port %p: error clear buffers %s", port, spa_strerror(res)); pw_log_error("port %p: error clear buffers %s", port, spa_strerror(res));
@ -892,7 +891,7 @@ error_exit:
static void clear_mix(struct node_data *data, struct mix *mix) static void clear_mix(struct node_data *data, struct mix *mix)
{ {
pw_log_debug("port %p: mix clear %d.%d", mix->port, mix->port->port_id, mix->mix_id); pw_log_debug("port %p: mix clear %d.%d", mix->port, mix->port->port_id, mix->mix.id);
spa_node_port_set_io(mix->port->mix, mix->mix.port.direction, spa_node_port_set_io(mix->port->mix, mix->mix.port.direction,
mix->mix.port.port_id, SPA_IO_Buffers, NULL, 0); mix->mix.port.port_id, SPA_IO_Buffers, NULL, 0);
@ -903,6 +902,7 @@ static void clear_mix(struct node_data *data, struct mix *mix)
pw_array_clear(&mix->buffers); pw_array_clear(&mix->buffers);
spa_list_append(&data->free_mix, &mix->link); spa_list_append(&data->free_mix, &mix->link);
if (mix->mix.id != SPA_ID_INVALID)
pw_impl_port_release_mix(mix->port, &mix->mix); pw_impl_port_release_mix(mix->port, &mix->mix);
} }