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: pass the NODE_ASYNC flag correctly

Browse source 
Pass the follower async flag correctly in the adapter.
This commit is contained in:
Wim Taymans 2023-03-30 14:51:50 +02:00
parent 4fb17d1c03
commit b3940627dd
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,11 +366,11 @@ static int negotiate_buffers(struct impl *this)
struct spa_data *datas; struct spa_data *datas;
uint64_t follower_flags, conv_flags; uint64_t follower_flags, conv_flags;
spa_log_debug(this->log, "%p: n_buffers:%d", this, this->n_buffers);
if (this->target == this->follower) if (this->target == this->follower)
return 0; return 0;
spa_log_debug(this->log, "%p: n_buffers:%d", this, this->n_buffers);
if (this->n_buffers > 0) if (this->n_buffers > 0)
return 0; return 0;
@ -579,9 +579,10 @@ static int reconfigure_mode(struct impl *this, bool passthrough,
} }
link_io(this); link_io(this);
} }
this->info.change_mask |= SPA_NODE_CHANGE_MASK_FLAGS | SPA_NODE_CHANGE_MASK_PARAMS; this->info.change_mask |= SPA_NODE_CHANGE_MASK_FLAGS | SPA_NODE_CHANGE_MASK_PARAMS;
this->info.flags &= ~SPA_NODE_FLAG_NEED_CONFIGURE; SPA_FLAG_CLEAR(this->info.flags, SPA_NODE_FLAG_NEED_CONFIGURE);
SPA_FLAG_UPDATE(this->info.flags, SPA_NODE_FLAG_ASYNC,
this->async && this->follower == this->target);
this->params[IDX_Props].user++; this->params[IDX_Props].user++;
emit_node_info(this, false); emit_node_info(this, false);
@ -757,17 +758,16 @@ static int negotiate_format(struct impl *this)
struct spa_pod_builder b = { 0 }; struct spa_pod_builder b = { 0 };
int res; int res;
if (this->target == this->follower)
return 0;
spa_log_debug(this->log, "%p: have_format:%d", this, this->have_format); spa_log_debug(this->log, "%p: have_format:%d", this, this->have_format);
if (this->have_format) if (this->have_format)
return 0; return 0;
if (this->target == this->follower)
return 0;
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
spa_node_send_command(this->follower, spa_node_send_command(this->follower,
&SPA_NODE_COMMAND_INIT(SPA_NODE_COMMAND_ParamBegin)); &SPA_NODE_COMMAND_INIT(SPA_NODE_COMMAND_ParamBegin));
@ -1007,6 +1007,8 @@ static void follower_info(void *data, const struct spa_node_info *info)
this->info.flags |= SPA_NODE_FLAG_OUT_PORT_CONFIG; this->info.flags |= SPA_NODE_FLAG_OUT_PORT_CONFIG;
this->info.max_output_ports = MAX_PORTS; this->info.max_output_ports = MAX_PORTS;
} }
SPA_FLAG_UPDATE(this->info.flags, SPA_NODE_FLAG_ASYNC,
this->async && this->follower == this->target);
spa_log_debug(this->log, "%p: follower info %s", this, spa_log_debug(this->log, "%p: follower info %s", this,
this->direction == SPA_DIRECTION_INPUT ? this->direction == SPA_DIRECTION_INPUT ?