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

audioconvert: keep better track of changed params

Browse source 
Keep all the children param flags around and use those to decide
if something changed. Also don't change the param flag serial when
we are simply adding a listener.

This should reduce the number of param updates, most notably the
PropInfo that was updated along with the Props on volume changes.
This commit is contained in:
Wim Taymans 2021-03-12 11:10:43 +01:00
parent 6562a2ab79
commit 86cf4ad5a5
2 changed files with 67 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

77
spa/plugins/audioconvert/audioadapter.c
View file

@ -83,6 +83,8 @@ struct impl {
#define IDX_EnumPortConfig 4
#define IDX_PortConfig 5
struct spa_param_info params[6];
uint32_t convert_params_flags[6];
uint32_t follower_params_flags[6];
struct spa_hook_list hooks;
struct spa_callbacks callbacks;
@ -597,7 +599,7 @@ static void convert_node_info(void *data, const struct spa_node_info *info)
}
if (info->change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) {
uint32_t idx = SPA_ID_INVALID;
uint32_t idx;
switch (info->params[i].id) {
case SPA_PARAM_PropInfo:
@ -606,14 +608,21 @@ static void convert_node_info(void *data, const struct spa_node_info *info)
case SPA_PARAM_Props:
idx = IDX_Props;
break;
default:
continue;
}
if (idx != SPA_ID_INVALID) {
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener &&
this->convert_params_flags[idx] == info->params[i].flags)
continue;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->convert_params_flags[idx] = info->params[i].flags;
this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener)
this->params[idx].user++;
}
}
}
emit_node_info(this, false);
@ -677,20 +686,27 @@ static void follower_info(void *data, const struct spa_node_info *info)
}
if (info->change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) {
uint32_t idx = SPA_ID_INVALID;
uint32_t idx;
switch (info->params[i].id) {
case SPA_PARAM_Props:
idx = IDX_Props;
break;
default:
continue;
}
if (idx != SPA_ID_INVALID) {
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener &&
this->follower_params_flags[idx] == info->params[i].flags)
continue;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->follower_params_flags[idx] = info->params[i].flags;
this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener)
this->params[idx].user++;
}
}
}
emit_node_info(this, false);
@ -705,24 +721,30 @@ static void follower_port_info(void *data,
if (info->change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) {
uint32_t idx = SPA_ID_INVALID;
uint32_t idx;
switch (info->params[i].id) {
case SPA_PARAM_Format:
idx = IDX_Format;
break;
default:
continue;
}
if (idx != SPA_ID_INVALID) {
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener &&
this->follower_params_flags[idx] == info->params[i].flags)
continue;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->follower_params_flags[idx] = info->params[i].flags;
this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener)
this->params[idx].user++;
}
}
}
if (!this->add_listener)
emit_node_info(this, false);
emit_node_info(this, false);
}
static const struct spa_node_events follower_node_events = {
@ -785,9 +807,9 @@ static int impl_node_add_listener(void *object,
spa_log_trace(this->log, NAME" %p: add listener %p", this, listener);
spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
this->add_listener = true;
if (events->info || events->port_info) {
this->add_listener = true;
spa_zero(l);
spa_node_add_listener(this->follower, &l, &follower_node_events, this);
@ -797,12 +819,11 @@ static int impl_node_add_listener(void *object,
spa_zero(l);
spa_node_add_listener(this->convert, &l, &convert_node_events, this);
spa_hook_remove(&l);
} else {
emit_node_info(this, false);
}
}
this->add_listener = false;
this->add_listener = false;
emit_node_info(this, true);
}
spa_hook_list_join(&this->hooks, &save);
return 0;

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

@ -86,6 +86,7 @@ struct impl {
#define IDX_PropInfo 2
#define IDX_Props 3
struct spa_param_info params[4];
uint32_t param_flags[4];
int n_links;
struct link links[8];
@ -615,8 +616,11 @@ static void on_channelmix_info(void *data, const struct spa_node_info *info)
struct impl *this = data;
uint32_t i;
if ((info->change_mask & SPA_NODE_CHANGE_MASK_PARAMS) == 0)
return;
for (i = 0; i < info->n_params; i++) {
uint32_t idx = SPA_ID_INVALID;
uint32_t idx;
switch (info->params[i].id) {
case SPA_PARAM_PropInfo:
@ -625,14 +629,21 @@ static void on_channelmix_info(void *data, const struct spa_node_info *info)
case SPA_PARAM_Props:
idx = IDX_Props;
break;
default:
continue;
}
if (idx != SPA_ID_INVALID) {
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener &&
this->param_flags[idx] == info->params[i].flags)
continue;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->param_flags[idx] = info->params[i].flags;
this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener)
this->params[idx].user++;
}
}
emit_node_info(this, false);
}