mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: use PipeWire format and channel names

Browse source 
Use the PipeWire format and channel names in the config to avoid
confusion.
This commit is contained in:
Wim Taymans 2021-04-09 11:30:57 +02:00
parent b305f57e4d
commit 44e6e7f5c8
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/daemon/pipewire-pulse.conf.in
View file

@ -40,8 +40,8 @@ context.modules = [
#pulse.default.frag = 96000/48000 # 2 seconds #pulse.default.frag = 96000/48000 # 2 seconds
#pulse.default.tlength = 96000/48000 # 2 seconds #pulse.default.tlength = 96000/48000 # 2 seconds
#pulse.min.quantum = 256/48000 # 5ms #pulse.min.quantum = 256/48000 # 5ms
#pulse.default.format = "float32ne" #pulse.default.format = F32LE
#pulse.default.channel_map = "front-left,front-right" #pulse.default.position = [ FL FR ]
} }
} }
] ]

9
src/modules/module-protocol-pulse/format.c
View file

@ -117,6 +117,15 @@ static inline const char *format_id2name(uint32_t format)
} }
return "UNKNOWN"; return "UNKNOWN";
} }
static inline uint32_t format_name2id(const char *name)
{
int i;
for (i = 0; spa_type_audio_format[i].name; i++) {
if (strcmp(name, spa_debug_type_short_name(spa_type_audio_format[i].name)) == 0)
return spa_type_audio_format[i].type;
}
return SPA_AUDIO_CHANNEL_UNKNOWN;
}
static inline uint32_t format_paname2id(const char *name, size_t size) static inline uint32_t format_paname2id(const char *name, size_t size)
{ {

25
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -92,8 +92,12 @@ struct stats {
#define DEFAULT_DEFAULT_FRAG "96000/48000" #define DEFAULT_DEFAULT_FRAG "96000/48000"
#define DEFAULT_DEFAULT_TLENGTH "96000/48000" #define DEFAULT_DEFAULT_TLENGTH "96000/48000"
#define DEFAULT_MIN_QUANTUM "256/48000" #define DEFAULT_MIN_QUANTUM "256/48000"
#define DEFAULT_FORMAT "float32le" #if __BYTE_ORDER == __BIG_ENDIAN
#define DEFAULT_CHANNEL_MAP "front-left,front-right" #define DEFAULT_FORMAT "F32BE"
#else
#define DEFAULT_FORMAT "F32LE"
#endif
#define DEFAULT_CHANNEL_MAP "[ FL FR ]"
#define MAX_FORMATS 32 #define MAX_FORMATS 32
@ -6357,14 +6361,27 @@ static int parse_frac(struct pw_properties *props, const char *key, const char *
pw_log_info(NAME": defaults: %s = %u/%u", key, res->num, res->denom); pw_log_info(NAME": defaults: %s = %u/%u", key, res->num, res->denom);
return 0; return 0;
} }
static int parse_channel_map(struct pw_properties *props, const char *key, const char *def, static int parse_channel_map(struct pw_properties *props, const char *key, const char *def,
struct channel_map *res) struct channel_map *res)
{ {
const char *str; const char *str;
struct spa_json it[2];
char v[256];
if (props == NULL || if (props == NULL ||
(str = pw_properties_get(props, key)) == NULL) (str = pw_properties_get(props, key)) == NULL)
str = def; str = def;
channel_map_parse(str, res);
spa_json_init(&it[0], str, strlen(str));
if (spa_json_enter_array(&it[0], &it[1]) <= 0)
spa_json_init(&it[1], str, strlen(str));
res->channels = 0;
while (spa_json_get_string(&it[1], v, sizeof(v)) > 0 &&
res->channels < SPA_AUDIO_MAX_CHANNELS) {
res->map[res->channels++] = channel_name2id(v);
}
pw_log_info(NAME": defaults: %s = %s", key, str); pw_log_info(NAME": defaults: %s = %s", key, str);
return 0; return 0;
} }
@ -6375,7 +6392,7 @@ static int parse_format(struct pw_properties *props, const char *key, const char
if (props == NULL || if (props == NULL ||
(str = pw_properties_get(props, key)) == NULL) (str = pw_properties_get(props, key)) == NULL)
str = def; str = def;
res->format = format_paname2id(str, strlen(str)); res->format = format_name2id(str);
if (res->format == SPA_AUDIO_FORMAT_UNKNOWN) if (res->format == SPA_AUDIO_FORMAT_UNKNOWN)
res->format = SPA_AUDIO_FORMAT_F32; res->format = SPA_AUDIO_FORMAT_F32;
pw_log_info(NAME": defaults: %s = %s", key, str); pw_log_info(NAME": defaults: %s = %s", key, str);