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: fix channels property

Browse source 
Setting the channel property should create as many channels as
requested, not just the number from the default channel map.

If no channel_map is set, use the default one if the channels match
or use one with unknown channel layout otherwise.

Check the configured channels against the channel map and error
if there is a mismatch.
This commit is contained in:
Wim Taymans 2021-04-14 15:23:34 +02:00
parent 7e741ef983
commit 8bf7ce5fa4
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/modules/module-protocol-pulse/module-null-sink.c
View file

@ -123,6 +123,7 @@ static struct module *create_module_null_sink(struct impl *impl, const char *arg
struct pw_properties *props = NULL;
const char *str;
struct channel_map map = CHANNEL_MAP_INIT;
uint32_t i, channels;
int res;
props = pw_properties_new_dict(&SPA_DICT_INIT_ARRAY(module_null_sink_info));
@ -144,11 +145,12 @@ static struct module *create_module_null_sink(struct impl *impl, const char *arg
pw_properties_set(props, "sink_properties", NULL);
}
if ((str = pw_properties_get(props, "channels")) != NULL) {
channels = atoi(str);
pw_properties_set(props, SPA_KEY_AUDIO_CHANNELS, str);
pw_properties_set(props, "channels", NULL);
} else {
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u",
impl->defs.sample_spec.channels);
channels = impl->defs.sample_spec.channels;
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", channels);
}
if ((str = pw_properties_get(props, "rate")) != NULL) {
pw_properties_set(props, SPA_KEY_AUDIO_RATE, str);
@ -158,10 +160,21 @@ static struct module *create_module_null_sink(struct impl *impl, const char *arg
channel_map_parse(str, &map);
pw_properties_set(props, "channel_map", NULL);
} else {
map = impl->defs.channel_map;
if (channels == impl->defs.channel_map.channels) {
map = impl->defs.channel_map;
} else {
for (i = 0; i < channels; i++)
map.map[i] = SPA_AUDIO_CHANNEL_UNKNOWN;
map.channels = channels;
}
}
if (map.channels != channels) {
pw_log_error("channel map does not match channels");
res = -EINVAL;
goto out;
}
if (map.channels > 0) {
uint32_t i;
char *s, *p;
p = s = alloca(map.channels * 6);
for (i = 0; i < map.channels; i++)