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

remote-node: only update changed fields

Browse source
This commit is contained in:
Wim Taymans 2020-10-09 16:31:17 +02:00
parent 85977634c1
commit 0e3198272b
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -277,7 +277,7 @@ static int client_node_transport(void *object,
return 0; return 0;
} }
static int add_node_update(struct node_data *data, uint32_t change_mask) static int add_node_update(struct node_data *data, uint32_t change_mask, uint32_t info_mask)
{ {
struct pw_impl_node *node = data->node; struct pw_impl_node *node = data->node;
struct spa_node_info ni = SPA_NODE_INFO_INIT(); struct spa_node_info ni = SPA_NODE_INFO_INIT();
@ -312,14 +312,11 @@ static int add_node_update(struct node_data *data, uint32_t change_mask)
if (change_mask & PW_CLIENT_NODE_UPDATE_INFO) { if (change_mask & PW_CLIENT_NODE_UPDATE_INFO) {
ni.max_input_ports = node->info.max_input_ports; ni.max_input_ports = node->info.max_input_ports;
ni.max_output_ports = node->info.max_output_ports; ni.max_output_ports = node->info.max_output_ports;
ni.change_mask = SPA_NODE_CHANGE_MASK_FLAGS | ni.change_mask = info_mask;
SPA_NODE_CHANGE_MASK_PROPS |
SPA_NODE_CHANGE_MASK_PARAMS;
ni.flags = node->spa_flags; ni.flags = node->spa_flags;
ni.props = node->info.props; ni.props = node->info.props;
ni.params = node->info.params; ni.params = node->info.params;
ni.n_params = node->info.n_params; ni.n_params = node->info.n_params;
} }
res = pw_client_node_update(data->client_node, res = pw_client_node_update(data->client_node,
@ -942,7 +939,10 @@ static void do_node_init(struct node_data *data)
pw_log_debug("%p: node %p init", data, data->node); pw_log_debug("%p: node %p init", data, data->node);
add_node_update(data, PW_CLIENT_NODE_UPDATE_PARAMS | add_node_update(data, PW_CLIENT_NODE_UPDATE_PARAMS |
PW_CLIENT_NODE_UPDATE_INFO); PW_CLIENT_NODE_UPDATE_INFO,
SPA_NODE_CHANGE_MASK_FLAGS |
SPA_NODE_CHANGE_MASK_PROPS |
SPA_NODE_CHANGE_MASK_PARAMS);
spa_list_for_each(port, &data->node->input_ports, link) { spa_list_for_each(port, &data->node->input_ports, link) {
add_port_update(data, port, add_port_update(data, port,
@ -1001,21 +1001,23 @@ static void node_free(void *data)
static void node_info_changed(void *data, const struct pw_node_info *info) static void node_info_changed(void *data, const struct pw_node_info *info)
{ {
struct node_data *d = data; struct node_data *d = data;
uint32_t change_mask; uint32_t change_mask, info_mask;
pw_log_debug("info changed %p", d); pw_log_debug("info changed %p", d);
if (d->client_node == NULL) if (d->client_node == NULL)
return; return;
change_mask = 0; change_mask = PW_CLIENT_NODE_UPDATE_INFO;
if (info->change_mask & PW_NODE_CHANGE_MASK_PROPS) info_mask = SPA_NODE_CHANGE_MASK_FLAGS;
change_mask |= PW_CLIENT_NODE_UPDATE_INFO; if (info->change_mask & PW_NODE_CHANGE_MASK_PROPS) {
info_mask |= SPA_NODE_CHANGE_MASK_PROPS;
}
if (info->change_mask & PW_NODE_CHANGE_MASK_PARAMS) { if (info->change_mask & PW_NODE_CHANGE_MASK_PARAMS) {
change_mask |= PW_CLIENT_NODE_UPDATE_PARAMS; change_mask |= PW_CLIENT_NODE_UPDATE_PARAMS;
change_mask |= PW_CLIENT_NODE_UPDATE_INFO; info_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
} }
add_node_update(d, change_mask); add_node_update(d, change_mask, info_mask);
} }
static void node_port_info_changed(void *data, struct pw_impl_port *port, static void node_port_info_changed(void *data, struct pw_impl_port *port,