mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: split out format handling

Browse source 
Part of !776.
This commit is contained in:
Barnabás Pőcze 2021-06-18 21:49:24 +02:00
parent 8ac60cb0ae
commit 43e2c64307
4 changed files with 126 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/meson.build
View file

@ -133,6 +133,7 @@ endif
pipewire_module_protocol_pulse_sources = [ pipewire_module_protocol_pulse_sources = [
'module-protocol-pulse.c', 'module-protocol-pulse.c',
'module-protocol-pulse/format.c',
'module-protocol-pulse/manager.c', 'module-protocol-pulse/manager.c',
'module-protocol-pulse/pulse-server.c', 'module-protocol-pulse/pulse-server.c',
'module-protocol-pulse/modules/module-combine-sink.c', 'module-protocol-pulse/modules/module-combine-sink.c',

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

@ -22,9 +22,14 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include "format.h"
#include <spa/utils/string.h> #include <spa/utils/string.h>
#include <spa/debug/types.h>
#include <spa/param/audio/format.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/audio/raw.h>
#include <spa/utils/json.h>
#include "format.h"
static const struct format audio_formats[] = { static const struct format audio_formats[] = {
[SAMPLE_U8] = { SAMPLE_U8, SPA_AUDIO_FORMAT_U8, "u8", 1 }, [SAMPLE_U8] = { SAMPLE_U8, SPA_AUDIO_FORMAT_U8, "u8", 1 },
@ -63,6 +68,68 @@ static const struct format audio_formats[] = {
{ SAMPLE_FLOAT32NE, SPA_AUDIO_FORMAT_F32P, "float32ne", 4 }, { SAMPLE_FLOAT32NE, SPA_AUDIO_FORMAT_F32P, "float32ne", 4 },
}; };
static const struct channel audio_channels[] = {
[CHANNEL_POSITION_MONO] = { SPA_AUDIO_CHANNEL_MONO, "mono", },
[CHANNEL_POSITION_FRONT_LEFT] = { SPA_AUDIO_CHANNEL_FL, "front-left", },
[CHANNEL_POSITION_FRONT_RIGHT] = { SPA_AUDIO_CHANNEL_FR, "front-right", },
[CHANNEL_POSITION_FRONT_CENTER] = { SPA_AUDIO_CHANNEL_FC, "front-center", },
[CHANNEL_POSITION_REAR_CENTER] = { SPA_AUDIO_CHANNEL_RC, "rear-center", },
[CHANNEL_POSITION_REAR_LEFT] = { SPA_AUDIO_CHANNEL_RL, "rear-left", },
[CHANNEL_POSITION_REAR_RIGHT] = { SPA_AUDIO_CHANNEL_RR, "rear-right", },
[CHANNEL_POSITION_LFE] = { SPA_AUDIO_CHANNEL_LFE, "lfe", },
[CHANNEL_POSITION_FRONT_LEFT_OF_CENTER] = { SPA_AUDIO_CHANNEL_FLC, "front-left-of-center", },
[CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER] = { SPA_AUDIO_CHANNEL_FRC, "front-right-of-center", },
[CHANNEL_POSITION_SIDE_LEFT] = { SPA_AUDIO_CHANNEL_SL, "side-left", },
[CHANNEL_POSITION_SIDE_RIGHT] = { SPA_AUDIO_CHANNEL_SR, "side-right", },
[CHANNEL_POSITION_AUX0] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 1, "aux0", },
[CHANNEL_POSITION_AUX1] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 2, "aux1", },
[CHANNEL_POSITION_AUX2] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 3, "aux2", },
[CHANNEL_POSITION_AUX3] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 4, "aux3", },
[CHANNEL_POSITION_AUX4] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 5, "aux4", },
[CHANNEL_POSITION_AUX5] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 6, "aux5", },
[CHANNEL_POSITION_AUX6] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 7, "aux6", },
[CHANNEL_POSITION_AUX7] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 8, "aux7", },
[CHANNEL_POSITION_AUX8] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 9, "aux8", },
[CHANNEL_POSITION_AUX9] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 10, "aux9", },
[CHANNEL_POSITION_AUX10] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 11, "aux10", },
[CHANNEL_POSITION_AUX11] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 12, "aux11", },
[CHANNEL_POSITION_AUX12] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 13, "aux12", },
[CHANNEL_POSITION_AUX13] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 14, "aux13", },
[CHANNEL_POSITION_AUX14] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 15, "aux14", },
[CHANNEL_POSITION_AUX15] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 16, "aux15", },
[CHANNEL_POSITION_AUX16] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 17, "aux16", },
[CHANNEL_POSITION_AUX17] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 18, "aux17", },
[CHANNEL_POSITION_AUX18] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 19, "aux18", },
[CHANNEL_POSITION_AUX19] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 20, "aux19", },
[CHANNEL_POSITION_AUX20] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 21, "aux20", },
[CHANNEL_POSITION_AUX21] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 22, "aux21", },
[CHANNEL_POSITION_AUX22] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 23, "aux22", },
[CHANNEL_POSITION_AUX23] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 24, "aux23", },
[CHANNEL_POSITION_AUX24] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 25, "aux24", },
[CHANNEL_POSITION_AUX25] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 26, "aux25", },
[CHANNEL_POSITION_AUX26] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 27, "aux26", },
[CHANNEL_POSITION_AUX27] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 28, "aux27", },
[CHANNEL_POSITION_AUX28] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 29, "aux28", },
[CHANNEL_POSITION_AUX29] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 30, "aux29", },
[CHANNEL_POSITION_AUX30] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 31, "aux30", },
[CHANNEL_POSITION_AUX31] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 32, "aux31", },
[CHANNEL_POSITION_TOP_CENTER] = { SPA_AUDIO_CHANNEL_TC, "top-center", },
[CHANNEL_POSITION_TOP_FRONT_LEFT] = { SPA_AUDIO_CHANNEL_TFL, "top-front-left", },
[CHANNEL_POSITION_TOP_FRONT_RIGHT] = { SPA_AUDIO_CHANNEL_TFR, "top-front-right", },
[CHANNEL_POSITION_TOP_FRONT_CENTER] = { SPA_AUDIO_CHANNEL_TFC, "top-front-center", },
[CHANNEL_POSITION_TOP_REAR_LEFT] = { SPA_AUDIO_CHANNEL_TRL, "top-rear-left", },
[CHANNEL_POSITION_TOP_REAR_RIGHT] = { SPA_AUDIO_CHANNEL_TRR, "top-rear-right", },
[CHANNEL_POSITION_TOP_REAR_CENTER] = { SPA_AUDIO_CHANNEL_TRC, "top-rear-center", },
};
uint32_t format_pa2id(enum sample_format format) uint32_t format_pa2id(enum sample_format format)
{ {
if (format < 0 || format >= SAMPLE_MAX) if (format < 0 || format >= SAMPLE_MAX)
@ -79,6 +146,7 @@ const char *format_id2name(uint32_t format)
} }
return "UNKNOWN"; return "UNKNOWN";
} }
uint32_t format_name2id(const char *name) uint32_t format_name2id(const char *name)
{ {
int i; int i;
@ -156,73 +224,12 @@ bool sample_spec_valid(const struct sample_spec *ss)
ss->channels > 0 && ss->channels <= CHANNELS_MAX); ss->channels > 0 && ss->channels <= CHANNELS_MAX);
} }
static const struct channel audio_channels[] = {
[CHANNEL_POSITION_MONO] = { SPA_AUDIO_CHANNEL_MONO, "mono", },
[CHANNEL_POSITION_FRONT_LEFT] = { SPA_AUDIO_CHANNEL_FL, "front-left", },
[CHANNEL_POSITION_FRONT_RIGHT] = { SPA_AUDIO_CHANNEL_FR, "front-right", },
[CHANNEL_POSITION_FRONT_CENTER] = { SPA_AUDIO_CHANNEL_FC, "front-center", },
[CHANNEL_POSITION_REAR_CENTER] = { SPA_AUDIO_CHANNEL_RC, "rear-center", },
[CHANNEL_POSITION_REAR_LEFT] = { SPA_AUDIO_CHANNEL_RL, "rear-left", },
[CHANNEL_POSITION_REAR_RIGHT] = { SPA_AUDIO_CHANNEL_RR, "rear-right", },
[CHANNEL_POSITION_LFE] = { SPA_AUDIO_CHANNEL_LFE, "lfe", },
[CHANNEL_POSITION_FRONT_LEFT_OF_CENTER] = { SPA_AUDIO_CHANNEL_FLC, "front-left-of-center", },
[CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER] = { SPA_AUDIO_CHANNEL_FRC, "front-right-of-center", },
[CHANNEL_POSITION_SIDE_LEFT] = { SPA_AUDIO_CHANNEL_SL, "side-left", },
[CHANNEL_POSITION_SIDE_RIGHT] = { SPA_AUDIO_CHANNEL_SR, "side-right", },
[CHANNEL_POSITION_AUX0] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 1, "aux0", },
[CHANNEL_POSITION_AUX1] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 2, "aux1", },
[CHANNEL_POSITION_AUX2] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 3, "aux2", },
[CHANNEL_POSITION_AUX3] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 4, "aux3", },
[CHANNEL_POSITION_AUX4] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 5, "aux4", },
[CHANNEL_POSITION_AUX5] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 6, "aux5", },
[CHANNEL_POSITION_AUX6] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 7, "aux6", },
[CHANNEL_POSITION_AUX7] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 8, "aux7", },
[CHANNEL_POSITION_AUX8] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 9, "aux8", },
[CHANNEL_POSITION_AUX9] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 10, "aux9", },
[CHANNEL_POSITION_AUX10] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 11, "aux10", },
[CHANNEL_POSITION_AUX11] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 12, "aux11", },
[CHANNEL_POSITION_AUX12] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 13, "aux12", },
[CHANNEL_POSITION_AUX13] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 14, "aux13", },
[CHANNEL_POSITION_AUX14] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 15, "aux14", },
[CHANNEL_POSITION_AUX15] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 16, "aux15", },
[CHANNEL_POSITION_AUX16] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 17, "aux16", },
[CHANNEL_POSITION_AUX17] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 18, "aux17", },
[CHANNEL_POSITION_AUX18] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 19, "aux18", },
[CHANNEL_POSITION_AUX19] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 20, "aux19", },
[CHANNEL_POSITION_AUX20] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 21, "aux20", },
[CHANNEL_POSITION_AUX21] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 22, "aux21", },
[CHANNEL_POSITION_AUX22] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 23, "aux22", },
[CHANNEL_POSITION_AUX23] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 24, "aux23", },
[CHANNEL_POSITION_AUX24] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 25, "aux24", },
[CHANNEL_POSITION_AUX25] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 26, "aux25", },
[CHANNEL_POSITION_AUX26] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 27, "aux26", },
[CHANNEL_POSITION_AUX27] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 28, "aux27", },
[CHANNEL_POSITION_AUX28] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 29, "aux28", },
[CHANNEL_POSITION_AUX29] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 30, "aux29", },
[CHANNEL_POSITION_AUX30] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 31, "aux30", },
[CHANNEL_POSITION_AUX31] = { SPA_AUDIO_CHANNEL_CUSTOM_START + 32, "aux31", },
[CHANNEL_POSITION_TOP_CENTER] = { SPA_AUDIO_CHANNEL_TC, "top-center", },
[CHANNEL_POSITION_TOP_FRONT_LEFT] = { SPA_AUDIO_CHANNEL_TFL, "top-front-left", },
[CHANNEL_POSITION_TOP_FRONT_RIGHT] = { SPA_AUDIO_CHANNEL_TFR, "top-front-right", },
[CHANNEL_POSITION_TOP_FRONT_CENTER] = { SPA_AUDIO_CHANNEL_TFC, "top-front-center", },
[CHANNEL_POSITION_TOP_REAR_LEFT] = { SPA_AUDIO_CHANNEL_TRL, "top-rear-left", },
[CHANNEL_POSITION_TOP_REAR_RIGHT] = { SPA_AUDIO_CHANNEL_TRR, "top-rear-right", },
[CHANNEL_POSITION_TOP_REAR_CENTER] = { SPA_AUDIO_CHANNEL_TRC, "top-rear-center", },
};
uint32_t channel_pa2id(enum channel_position channel) uint32_t channel_pa2id(enum channel_position channel)
{ {
if (channel < 0 || (size_t)channel >= SPA_N_ELEMENTS(audio_channels)) if (channel < 0 || (size_t)channel >= SPA_N_ELEMENTS(audio_channels))
return SPA_AUDIO_CHANNEL_UNKNOWN; return SPA_AUDIO_CHANNEL_UNKNOWN;
return audio_channels[channel].channel;
return audio_channels[channel].channel;
} }
const char *channel_id2name(uint32_t channel) const char *channel_id2name(uint32_t channel)
@ -393,18 +400,7 @@ const char *format_encoding2name(enum encoding enc)
return "INVALID"; return "INVALID";
} }
struct format_info { int format_parse_param(const struct spa_pod *param, struct sample_spec *ss, struct channel_map *map)
enum encoding encoding;
struct pw_properties *props;
};
static void format_info_clear(struct format_info *info)
{
pw_properties_free(info->props);
spa_zero(*info);
}
static int format_parse_param(const struct spa_pod *param, struct sample_spec *ss, struct channel_map *map)
{ {
struct spa_audio_info info = { 0 }; struct spa_audio_info info = { 0 };
uint32_t i; uint32_t i;
@ -430,8 +426,8 @@ static int format_parse_param(const struct spa_pod *param, struct sample_spec *s
return 0; return 0;
} }
static const struct spa_pod *format_build_param(struct spa_pod_builder *b, const struct spa_pod *format_build_param(struct spa_pod_builder *b, uint32_t id,
uint32_t id, struct sample_spec *spec, struct channel_map *map) struct sample_spec *spec, struct channel_map *map)
{ {
struct spa_audio_info_raw info; struct spa_audio_info_raw info;
@ -445,8 +441,8 @@ static const struct spa_pod *format_build_param(struct spa_pod_builder *b,
return spa_format_audio_raw_build(b, id, &info); return spa_format_audio_raw_build(b, id, &info);
} }
static int format_info_from_spec(struct format_info *info, int format_info_from_spec(struct format_info *info, struct sample_spec *ss,
struct sample_spec *ss, struct channel_map *map) struct channel_map *map)
{ {
spa_zero(*info); spa_zero(*info);
info->encoding = ENCODING_PCM; info->encoding = ENCODING_PCM;
@ -471,8 +467,8 @@ static int format_info_from_spec(struct format_info *info,
return 0; return 0;
} }
static const struct spa_pod *format_info_build_param(struct spa_pod_builder *b, const struct spa_pod *format_info_build_param(struct spa_pod_builder *b, uint32_t id,
uint32_t id, struct format_info *info) struct format_info *info)
{ {
const char *str, *val; const char *str, *val;
struct sample_spec ss; struct sample_spec ss;

52
src/modules/module-protocol-pulse/format.h
View file

@ -25,6 +25,12 @@
#ifndef PULSE_SERVER_FORMAT_H #ifndef PULSE_SERVER_FORMAT_H
#define PULSE_SERVER_FORMAT_H #define PULSE_SERVER_FORMAT_H
#include <spa/utils/defs.h>
#include <pipewire/properties.h>
struct spa_pod;
struct spa_pod_builder;
#define RATE_MAX (48000u*8u) #define RATE_MAX (48000u*8u)
#define CHANNELS_MAX (64u) #define CHANNELS_MAX (64u)
@ -72,11 +78,12 @@ struct sample_spec {
uint32_t rate; uint32_t rate;
uint8_t channels; uint8_t channels;
}; };
#define SAMPLE_SPEC_INIT (struct sample_spec) { \ #define SAMPLE_SPEC_INIT \
.format = SPA_AUDIO_FORMAT_UNKNOWN, \ (struct sample_spec) { \
.rate = 0, \ .format = SPA_AUDIO_FORMAT_UNKNOWN, \
.channels = 0, \ .rate = 0, \
} .channels = 0, \
}
enum channel_position { enum channel_position {
CHANNEL_POSITION_INVALID = -1, CHANNEL_POSITION_INVALID = -1,
@ -151,9 +158,10 @@ struct channel_map {
uint32_t map[CHANNELS_MAX]; uint32_t map[CHANNELS_MAX];
}; };
#define CHANNEL_MAP_INIT (struct channel_map) { \ #define CHANNEL_MAP_INIT \
.channels = 0, \ (struct channel_map) { \
} .channels = 0, \
}
enum encoding { enum encoding {
ENCODING_ANY, ENCODING_ANY,
@ -169,23 +177,49 @@ enum encoding {
ENCODING_INVALID = -1, ENCODING_INVALID = -1,
}; };
struct format_info {
enum encoding encoding;
struct pw_properties *props;
};
uint32_t format_pa2id(enum sample_format format); uint32_t format_pa2id(enum sample_format format);
const char *format_id2name(uint32_t format); const char *format_id2name(uint32_t format);
uint32_t format_name2id(const char *name); uint32_t format_name2id(const char *name);
uint32_t format_paname2id(const char *name, size_t size); uint32_t format_paname2id(const char *name, size_t size);
enum sample_format format_id2pa(uint32_t id); enum sample_format format_id2pa(uint32_t id);
const char *format_id2paname(uint32_t id); const char *format_id2paname(uint32_t id);
const char *format_encoding2name(enum encoding enc);
uint32_t sample_spec_frame_size(const struct sample_spec *ss); uint32_t sample_spec_frame_size(const struct sample_spec *ss);
bool sample_spec_valid(const struct sample_spec *ss); bool sample_spec_valid(const struct sample_spec *ss);
uint32_t channel_pa2id(enum channel_position channel); uint32_t channel_pa2id(enum channel_position channel);
const char *channel_id2name(uint32_t channel); const char *channel_id2name(uint32_t channel);
uint32_t channel_name2id(const char *name); uint32_t channel_name2id(const char *name);
enum channel_position channel_id2pa(uint32_t id, uint32_t *aux); enum channel_position channel_id2pa(uint32_t id, uint32_t *aux);
const char *channel_id2paname(uint32_t id, uint32_t *aux); const char *channel_id2paname(uint32_t id, uint32_t *aux);
uint32_t channel_paname2id(const char *name, size_t size); uint32_t channel_paname2id(const char *name, size_t size);
void channel_map_to_positions(const struct channel_map *map, uint32_t *pos); void channel_map_to_positions(const struct channel_map *map, uint32_t *pos);
void channel_map_parse(const char *str, struct channel_map *map); void channel_map_parse(const char *str, struct channel_map *map);
bool channel_map_valid(const struct channel_map *map); bool channel_map_valid(const struct channel_map *map);
const char *format_encoding2name(enum encoding enc);
int format_parse_param(const struct spa_pod *param, struct sample_spec *ss,
struct channel_map *map);
const struct spa_pod *format_build_param(struct spa_pod_builder *b, uint32_t id,
struct sample_spec *spec, struct channel_map *map);
int format_info_from_spec(struct format_info *info, struct sample_spec *ss,
struct channel_map *map);
const struct spa_pod *format_info_build_param(struct spa_pod_builder *b, uint32_t id,
struct format_info *info);
static inline void format_info_clear(struct format_info *info)
{
pw_properties_free(info->props);
spa_zero(*info);
}
#endif #endif

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

@ -82,6 +82,7 @@
#include "pulse-server.h" #include "pulse-server.h"
#include "commands.h" #include "commands.h"
#include "defs.h" #include "defs.h"
#include "format.h"
#include "internal.h" #include "internal.h"
#define DEFAULT_MIN_REQ "256/48000" #define DEFAULT_MIN_REQ "256/48000"
@ -98,7 +99,6 @@
#define MAX_FORMATS 32 #define MAX_FORMATS 32
#define MAX_CLIENTS 64 #define MAX_CLIENTS 64
#include "format.c"
#include "volume.c" #include "volume.c"
#include "message.c" #include "message.c"
#include "manager.h" #include "manager.h"