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

pulse-server: fix echo-cancel _master args

Browse source 
The sink_master and source_master should be set on the capture and
playback streams so use the new properties on module-echo-cancel to do
this.
This commit is contained in:
Wim Taymans 2023-01-07 15:00:40 +01:00
parent feac9f1c70
commit b2f43e7bad
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/module-protocol-pulse/modules/module-echo-cancel.c
View file

@ -44,8 +44,10 @@ struct module_echo_cancel_data {
struct spa_hook mod_listener; struct spa_hook mod_listener;
struct pw_properties *props; struct pw_properties *props;
struct pw_properties *capture_props;
struct pw_properties *source_props; struct pw_properties *source_props;
struct pw_properties *sink_props; struct pw_properties *sink_props;
struct pw_properties *playback_props;
struct spa_audio_info_raw info; struct spa_audio_info_raw info;
}; };
@ -94,10 +96,14 @@ static int module_echo_cancel_load(struct module *module)
fprintf(f, " ]"); fprintf(f, " ]");
} }
} }
fprintf(f, " source.props = {"); fprintf(f, " capture.props = {");
pw_properties_serialize_dict(f, &data->capture_props->dict, 0);
fprintf(f, " } source.props = {");
pw_properties_serialize_dict(f, &data->source_props->dict, 0); pw_properties_serialize_dict(f, &data->source_props->dict, 0);
fprintf(f, " } sink.props = {"); fprintf(f, " } sink.props = {");
pw_properties_serialize_dict(f, &data->sink_props->dict, 0); pw_properties_serialize_dict(f, &data->sink_props->dict, 0);
fprintf(f, " } playback.props = {");
pw_properties_serialize_dict(f, &data->playback_props->dict, 0);
fprintf(f, " } }"); fprintf(f, " } }");
fclose(f); fclose(f);
@ -127,8 +133,10 @@ static int module_echo_cancel_unload(struct module *module)
} }
pw_properties_free(d->props); pw_properties_free(d->props);
pw_properties_free(d->capture_props);
pw_properties_free(d->source_props); pw_properties_free(d->source_props);
pw_properties_free(d->sink_props); pw_properties_free(d->sink_props);
pw_properties_free(d->playback_props);
return 0; return 0;
} }
@ -167,6 +175,7 @@ static int module_echo_cancel_prepare(struct module * const module)
struct module_echo_cancel_data * const d = module->user_data; struct module_echo_cancel_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
struct pw_properties *aec_props = NULL, *sink_props = NULL, *source_props = NULL; struct pw_properties *aec_props = NULL, *sink_props = NULL, *source_props = NULL;
struct pw_properties *playback_props = NULL, *capture_props = NULL;
const char *str; const char *str;
struct spa_audio_info_raw info = { 0 }; struct spa_audio_info_raw info = { 0 };
int res; int res;
@ -174,9 +183,11 @@ static int module_echo_cancel_prepare(struct module * const module)
PW_LOG_TOPIC_INIT(mod_topic); PW_LOG_TOPIC_INIT(mod_topic);
aec_props = pw_properties_new(NULL, NULL); aec_props = pw_properties_new(NULL, NULL);
capture_props = pw_properties_new(NULL, NULL);
source_props = pw_properties_new(NULL, NULL); source_props = pw_properties_new(NULL, NULL);
sink_props = pw_properties_new(NULL, NULL); sink_props = pw_properties_new(NULL, NULL);
if (!aec_props || !source_props || !sink_props) { playback_props = pw_properties_new(NULL, NULL);
if (!aec_props || !source_props || !sink_props || !capture_props || !playback_props) {
res = -EINVAL; res = -EINVAL;
goto out; goto out;
} }
@ -197,18 +208,18 @@ static int module_echo_cancel_prepare(struct module * const module)
if ((str = pw_properties_get(props, "source_master")) != NULL) { if ((str = pw_properties_get(props, "source_master")) != NULL) {
if (spa_strendswith(str, ".monitor")) { if (spa_strendswith(str, ".monitor")) {
pw_properties_setf(source_props, PW_KEY_NODE_TARGET, pw_properties_setf(capture_props, PW_KEY_NODE_TARGET,
"%.*s", (int)strlen(str)-8, str); "%.*s", (int)strlen(str)-8, str);
pw_properties_set(source_props, PW_KEY_STREAM_CAPTURE_SINK, pw_properties_set(capture_props, PW_KEY_STREAM_CAPTURE_SINK,
"true"); "true");
} else { } else {
pw_properties_set(source_props, PW_KEY_NODE_TARGET, str); pw_properties_set(capture_props, PW_KEY_NODE_TARGET, str);
} }
pw_properties_set(props, "source_master", NULL); pw_properties_set(props, "source_master", NULL);
} }
if ((str = pw_properties_get(props, "sink_master")) != NULL) { if ((str = pw_properties_get(props, "sink_master")) != NULL) {
pw_properties_set(sink_props, PW_KEY_NODE_TARGET, str); pw_properties_set(playback_props, PW_KEY_NODE_TARGET, str);
pw_properties_set(props, "sink_master", NULL); pw_properties_set(props, "sink_master", NULL);
} }
@ -239,15 +250,19 @@ static int module_echo_cancel_prepare(struct module * const module)
d->module = module; d->module = module;
d->props = aec_props; d->props = aec_props;
d->capture_props = capture_props;
d->source_props = source_props; d->source_props = source_props;
d->sink_props = sink_props; d->sink_props = sink_props;
d->playback_props = playback_props;
d->info = info; d->info = info;
return 0; return 0;
out: out:
pw_properties_free(aec_props); pw_properties_free(aec_props);
pw_properties_free(playback_props);
pw_properties_free(sink_props); pw_properties_free(sink_props);
pw_properties_free(source_props); pw_properties_free(source_props);
pw_properties_free(capture_props);
return res; return res;
} }