system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-09-06 00:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

pulse-server: Factor out sample spec/channel parsing from modargs

Browse source 
This should be more broadly useful for other modules.
This commit is contained in:
Arun Raghavan 2021-04-15 14:40:16 -04:00
parent 9c8a578e21
commit abf193452c
2 changed files with 51 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -258,41 +258,9 @@ static struct module *create_module_loopback(struct impl *impl, const char *argu
pw_properties_set(props, "sink", NULL);
}
info.format = SPA_AUDIO_FORMAT_F32P;
if ((str = pw_properties_get(props, "channels")) != NULL) {
info.channels = pw_properties_parse_int(str);
pw_properties_set(props, "channels", NULL);
} else {
info.channels = impl->defs.sample_spec.channels;
}
if ((str = pw_properties_get(props, "rate")) != NULL) {
info.rate = pw_properties_parse_int(str);
pw_properties_set(props, "rate", NULL);
} else {
info.rate = 0;
}
if ((str = pw_properties_get(props, "channel_map")) != NULL) {
struct channel_map map;
channel_map_parse(str, &map);
if (info.channels != map.channels)
ERROR_RETURN("Mismatched channel map");
channel_map_to_positions(&map, info.position);
pw_properties_set(props, "channel_map", NULL);
} else {
if (info.channels == impl->defs.channel_map.channels) {
channel_map_to_positions(&impl->defs.channel_map, info.position);
} else if (info.channels == 1) {
info.position[0] = SPA_AUDIO_CHANNEL_MONO;
} else if (info.channels == 2) {
info.position[0] = SPA_AUDIO_CHANNEL_FL;
info.position[1] = SPA_AUDIO_CHANNEL_FR;
} else {
ERROR_RETURN("Mismatched channel map");
}
/* TODO: pull in all of pa_channel_map_init_auto() */
if (args_to_audioinfo(impl, props, &info) < 0) {
res = -EINVAL;
goto out;
}
if ((str = pw_properties_get(props, "source_dont_move")) != NULL) {

48
src/modules/module-protocol-pulse/module.c
View file

@ -177,6 +177,54 @@ static void add_props(struct pw_properties *props, const char *str)
free(s);
}
static int args_to_audioinfo(struct impl *impl, struct pw_properties *props, struct spa_audio_info_raw *info)
{
const char *str;
/* We don't use any incoming format setting and use our native format */
info->format = SPA_AUDIO_FORMAT_F32P;
if ((str = pw_properties_get(props, "channels")) != NULL) {
info->channels = pw_properties_parse_int(str);
pw_properties_set(props, "channels", NULL);
} else {
info->channels = impl->defs.sample_spec.channels;
}
if ((str = pw_properties_get(props, "rate")) != NULL) {
info->rate = pw_properties_parse_int(str);
pw_properties_set(props, "rate", NULL);
} else {
info->rate = 0;
}
if ((str = pw_properties_get(props, "channel_map")) != NULL) {
struct channel_map map;
channel_map_parse(str, &map);
if (info->channels != map.channels) {
pw_log_error("Mismatched channel map");
return -EINVAL;
}
channel_map_to_positions(&map, info->position);
pw_properties_set(props, "channel_map", NULL);
} else {
if (info->channels == impl->defs.channel_map.channels) {
channel_map_to_positions(&impl->defs.channel_map, info->position);
} else if (info->channels == 1) {
info->position[0] = SPA_AUDIO_CHANNEL_MONO;
} else if (info->channels == 2) {
info->position[0] = SPA_AUDIO_CHANNEL_FL;
info->position[1] = SPA_AUDIO_CHANNEL_FR;
} else {
pw_log_error("Mismatched channel map");
return -EINVAL;
}
/* TODO: pull in all of pa_channel_map_init_auto() */
}
return 0;
}
#include "module-loopback.c"
#include "module-null-sink.c"
#include "module-native-protocol-tcp.c"