colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m-si-audio-adapter: make sure format task is finished even if ports were already configured

Browse Source 
Currently, if the adapter node already has its ports configured when wireplumber
starts (For example a virtual node), the async _set_ports_format() call is never
completed because the node ports have not changed, stalling the event stack.
This fixes the issue by checking the Props param after configuring the ports,
and completes the task if there is one pending and the node already has ports
available.

Fixes #527
This commit is contained in:
Julian Bouzas
2023-11-22 10:05:46 -05:00
committed by George Kiagiadakis
parent 383b0e605d
commit 78fe6f1ef9
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/module-si-audio-adapter.c
View File

@@ -40,6 +40,7 @@ struct _WpSiAudioAdapter
struct spa_audio_info_raw raw_format;
gulong ports_changed_sigid;
gulong params_changed_sigid;
WpSpaPod *format;
gchar mode[32];
@@ -541,6 +542,20 @@ on_node_ports_changed (WpObject * node, WpSiAudioAdapter *self)
}
}
static void
on_node_params_changed (WpPipewireObject * proxy, const gchar *param_name,
WpSiAudioAdapter *self)
{
/* Only handle Props param that has been emitted when setting ports format */
if (!g_str_equal (param_name, "Props") || !self->format_task)
return;
/* If ports are already configured, finish task. This is the case for already
* loaded nodes such as virtual filters */
if (wp_node_get_n_ports (self->node) > 0)
on_node_ports_changed (WP_OBJECT (self->node), self);
}
static void
si_audio_adapter_enable_active (WpSessionItem *si, WpTransition *transition)
{
@@ -563,6 +578,8 @@ si_audio_adapter_enable_active (WpSessionItem *si, WpTransition *transition)
self->ports_changed_sigid = g_signal_connect_object (self->node,
"ports-changed", (GCallback) on_node_ports_changed, self, 0);
self->params_changed_sigid = g_signal_connect_object (self->node,
"params-changed", (GCallback) on_node_params_changed, self, 0);
/* If device node, enum available formats and set one of them */
if (!self->no_format && (self->is_device || self->dont_remix ||
@@ -584,6 +601,10 @@ si_audio_adapter_disable_active (WpSessionItem *si)
g_signal_handler_disconnect (self->node, self->ports_changed_sigid);
self->ports_changed_sigid = 0;
}
if (self->params_changed_sigid) {
g_signal_handler_disconnect (self->node, self->params_changed_sigid);
self->params_changed_sigid = 0;
}
wp_object_update_features (WP_OBJECT (self), 0,
WP_SESSION_ITEM_FEATURE_ACTIVE);