mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-08 12:06:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-echo-cancel: fix cleanup

Browse source 
Go to the error label to make sure verything is cleaned up properly when
loading the aec plugin fails for some reason.
This commit is contained in:
Wim Taymans 2026-05-06 12:27:09 +02:00
parent d33466a340
commit aac0f13487
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-echo-cancel.c
View file

@ -1509,7 +1509,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
impl->loader = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_PluginLoader); impl->loader = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_PluginLoader);
if (impl->loader == NULL) { if (impl->loader == NULL) {
pw_log_error("a plugin loader is needed"); pw_log_error("a plugin loader is needed");
return -EINVAL; res = -EINVAL;
goto error;
} }
struct spa_dict_item dict_items[] = { struct spa_dict_item dict_items[] = {
@ -1520,15 +1521,16 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
handle = spa_plugin_loader_load(impl->loader, SPA_NAME_AEC, &dict); handle = spa_plugin_loader_load(impl->loader, SPA_NAME_AEC, &dict);
if (handle == NULL) { if (handle == NULL) {
pw_log_error("aec plugin %s not available library.name %s", SPA_NAME_AEC, path); pw_log_error("aec plugin %s not available library.name %s", SPA_NAME_AEC, path);
return -ENOENT; res = -ENOENT;
goto error;
} }
impl->spa_handle = handle;
if ((res = spa_handle_get_interface(handle, SPA_TYPE_INTERFACE_AUDIO_AEC, &iface)) < 0) { if ((res = spa_handle_get_interface(handle, SPA_TYPE_INTERFACE_AUDIO_AEC, &iface)) < 0) {
pw_log_error("can't get %s interface %d", SPA_TYPE_INTERFACE_AUDIO_AEC, res); pw_log_error("can't get %s interface %d", SPA_TYPE_INTERFACE_AUDIO_AEC, res);
return res; goto error;
} }
impl->aec = iface; impl->aec = iface;
impl->spa_handle = handle;
if (impl->aec->iface.version > SPA_VERSION_AUDIO_AEC) { if (impl->aec->iface.version > SPA_VERSION_AUDIO_AEC) {
pw_log_error("codec plugin %s has incompatible ABI version (%d > %d)", pw_log_error("codec plugin %s has incompatible ABI version (%d > %d)",