mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: module-loopback fixes

Browse source 
source and sink need not be set and need to be mapped to the target
source/sink to connect to.
node.group needs to be a unique id shared by source/sink to make them
part of the same scheduling group and do clock sync.
Remove some unused properties
This commit is contained in:
Wim Taymans 2021-04-01 08:24:51 +02:00
parent 8383e86f33
commit cc7cbaa83b
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/module-protocol-pulse/module-loopback.c
View file

@ -126,6 +126,8 @@ static int module_loopback_load(struct client *client, struct module *module)
&data->core_listener, &data->core_listener,
&core_events, data); &core_events, data);
pw_properties_setf(data->capture_props, PW_KEY_NODE_GROUP, "loopback-%u", module->idx);
pw_properties_setf(data->playback_props, PW_KEY_NODE_GROUP, "loopback-%u", module->idx);
data->capture = pw_stream_new(data->core, data->capture = pw_stream_new(data->core,
"loopback capture", data->capture_props); "loopback capture", data->capture_props);
@ -225,23 +227,20 @@ static struct module *create_module_loopback(struct impl *impl, const char *argu
*/ */
if ((str = pw_properties_get(props, "source")) != NULL) { if ((str = pw_properties_get(props, "source")) != NULL) {
pw_properties_set(capture_props, PW_KEY_NODE_GROUP, str); pw_properties_set(capture_props, PW_KEY_NODE_TARGET, str);
pw_properties_set(props, "source", NULL); pw_properties_set(props, "source", NULL);
} else {
ERROR_RETURN("The 'source' property must be specified");
} }
if ((str = pw_properties_get(props, "sink")) != NULL) { if ((str = pw_properties_get(props, "sink")) != NULL) {
pw_properties_set(playback_props, PW_KEY_NODE_GROUP, str); pw_properties_set(playback_props, PW_KEY_NODE_TARGET, str);
pw_properties_set(props, "sink", NULL); pw_properties_set(props, "sink", NULL);
} else {
ERROR_RETURN("The 'sink' property must be specified");
} }
if ((str = pw_properties_get(props, "format")) != NULL) { if ((str = pw_properties_get(props, "format")) != NULL) {
info.format = format_paname2id(str, strlen(str)); info.format = format_paname2id(str, strlen(str));
if (info.format == SPA_AUDIO_FORMAT_UNKNOWN) if (info.format == SPA_AUDIO_FORMAT_UNKNOWN)
ERROR_RETURN("Unknown format specified"); ERROR_RETURN("Unknown format specified");
pw_properties_set(props, "format", NULL);
} else { } else {
info.format = SPA_AUDIO_FORMAT_F32P; info.format = SPA_AUDIO_FORMAT_F32P;
} }
@ -256,7 +255,6 @@ static struct module *create_module_loopback(struct impl *impl, const char *argu
if ((str = pw_properties_get(props, "channels")) != NULL) { if ((str = pw_properties_get(props, "channels")) != NULL) {
info.channels = pw_properties_parse_int(str); info.channels = pw_properties_parse_int(str);
pw_properties_set(props, "channels", NULL); pw_properties_set(props, "channels", NULL);
} else { } else {
info.channels = 2; info.channels = 2;
} }
@ -268,7 +266,6 @@ static struct module *create_module_loopback(struct impl *impl, const char *argu
if (info.channels != map.channels) if (info.channels != map.channels)
ERROR_RETURN("Mismatched channel map"); ERROR_RETURN("Mismatched channel map");
channel_map_to_positions(&map, info.position); channel_map_to_positions(&map, info.position);
pw_properties_set(props, "channel_map", NULL); pw_properties_set(props, "channel_map", NULL);
} else { } else {
if (info.channels > 2) if (info.channels > 2)
@ -298,6 +295,7 @@ static struct module *create_module_loopback(struct impl *impl, const char *argu
/* Note that the boolean is inverted */ /* Note that the boolean is inverted */
pw_properties_set(playback_props, PW_KEY_STREAM_DONT_REMIX, pw_properties_set(playback_props, PW_KEY_STREAM_DONT_REMIX,
pw_properties_parse_bool(str) ? "false" : "true"); pw_properties_parse_bool(str) ? "false" : "true");
pw_properties_set(props, "remix", NULL);
} }
if ((str = pw_properties_get(props, "latency_msec")) != NULL) { if ((str = pw_properties_get(props, "latency_msec")) != NULL) {
@ -320,9 +318,6 @@ static struct module *create_module_loopback(struct impl *impl, const char *argu
pw_properties_set(props, "source_output_properties", NULL); pw_properties_set(props, "source_output_properties", NULL);
} }
pw_properties_set(props, PW_KEY_FACTORY_NAME, "support.loopback");
pw_properties_set(props, PW_KEY_OBJECT_LINGER, "true");
module = module_new(impl, &module_loopback_methods, sizeof(*d)); module = module_new(impl, &module_loopback_methods, sizeof(*d));
if (module == NULL) { if (module == NULL) {
res = -errno; res = -errno;