mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: improve parsing of rate and channels

Browse source
This commit is contained in:
Wim Taymans 2022-06-04 18:54:50 +02:00
parent f2c53622d2
commit a84412ccb7
6 changed files with 21 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-example-source.c
View file

@ -99,15 +99,15 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
#define DEFAULT_FORMAT "S16"
#define DEFAULT_RATE 48000
#define DEFAULT_CHANNELS "2"
#define DEFAULT_CHANNELS 2
#define DEFAULT_POSITION "[ FL FR ]"
#define MODULE_USAGE "[ node.latency=<latency as fraction> ] " \
"[ node.name=<name of the nodes> ] " \
"[ node.description=<description of the nodes> ] " \
"[ audio.format=<format, default:"DEFAULT_FORMAT"> ] " \
"[ audio.rate=<sample rate, default: 48000> ] " \
"[ audio.channels=<number of channels, default:"DEFAULT_CHANNELS"> ] " \
"[ audio.rate=<sample rate, default: "SPA_STRINGIFY(DEFAULT_RATE)"> ] " \
"[ audio.channels=<number of channels, default:"SPA_STRINGIFY(EFAULT_CHANNELS) "> ] " \
"[ audio.position=<channel map, default:"DEFAULT_POSITION"> ] " \
"[ stream.props=<properties> ] "
@ -383,9 +383,7 @@ static int parse_audio_info(struct impl *impl)
pw_log_error("invalid rate '%s'", str);
return -EINVAL;
}
if ((str = pw_properties_get(props, PW_KEY_AUDIO_CHANNELS)) == NULL)
str = DEFAULT_CHANNELS;
info->channels = atoi(str);
info->channels = pw_properties_get_uint32(props, PW_KEY_AUDIO_CHANNELS, DEFAULT_CHANNELS);
if ((str = pw_properties_get(props, SPA_KEY_AUDIO_POSITION)) == NULL)
str = DEFAULT_POSITION;
parse_position(info, str, strlen(str));