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: don't just copy the converter flags

Browse source 
We need to manage our own flags based on the direction of the follower.

We also need to make sure we only clear the NEED_CONFIGURE flag
after we are actually configured, not just when we configured our
internal converter.

See #1548
This commit is contained in:
Wim Taymans 2021-08-25 15:11:54 +02:00
parent 67965d60be
commit 743aaa3dbd
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -730,10 +730,6 @@ static void convert_node_info(void *data, const struct spa_node_info *info)
struct impl *this = data; struct impl *this = data;
uint32_t i; uint32_t i;
if (info->change_mask & SPA_NODE_CHANGE_MASK_FLAGS) {
this->info.change_mask |= SPA_NODE_CHANGE_MASK_FLAGS;
this->info.flags = info->flags;
}
if (info->change_mask & SPA_NODE_CHANGE_MASK_PARAMS) { if (info->change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) { for (i = 0; i < info->n_params; i++) {
uint32_t idx; uint32_t idx;
@ -818,8 +814,13 @@ static void follower_info(void *data, const struct spa_node_info *info)
else else
this->direction = SPA_DIRECTION_OUTPUT; this->direction = SPA_DIRECTION_OUTPUT;
this->info.max_input_ports = this->direction == SPA_DIRECTION_INPUT ? MAX_PORTS : 0; if (this->direction == SPA_DIRECTION_INPUT) {
this->info.max_output_ports = this->direction == SPA_DIRECTION_OUTPUT ? MAX_PORTS : 0; this->info.flags |= SPA_NODE_FLAG_IN_PORT_CONFIG;
this->info.max_input_ports = MAX_PORTS;
} else {
this->info.flags |= SPA_NODE_FLAG_OUT_PORT_CONFIG;
this->info.max_output_ports = MAX_PORTS;
}
spa_log_debug(this->log, NAME" %p: follower info %s", this, spa_log_debug(this->log, NAME" %p: follower info %s", this,
this->direction == SPA_DIRECTION_INPUT ? this->direction == SPA_DIRECTION_INPUT ?
@ -1419,8 +1420,6 @@ impl_init(const struct spa_handle_factory *factory,
SPA_NODE_CHANGE_MASK_PARAMS; SPA_NODE_CHANGE_MASK_PARAMS;
this->info = SPA_NODE_INFO_INIT(); this->info = SPA_NODE_INFO_INIT();
this->info.flags = SPA_NODE_FLAG_RT | this->info.flags = SPA_NODE_FLAG_RT |
SPA_NODE_FLAG_IN_PORT_CONFIG |
SPA_NODE_FLAG_OUT_PORT_CONFIG |
SPA_NODE_FLAG_NEED_CONFIGURE; SPA_NODE_FLAG_NEED_CONFIGURE;
this->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); this->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
this->params[IDX_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ); this->params[IDX_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);