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

pulse-server: improve fix_* handling

Browse source 
When we have a fix_* flag set, make an extra format description with the
wildcards. This makes it possible for the session manager to fall back
to something when selecting a target and format.

Also only advertize the valid pulseaudio formats for the wildcards.

Fixes #1912
This commit is contained in:
Wim Taymans 2021-12-16 12:56:19 +01:00
parent 12cc3b34b1
commit de12e8dd2c
2 changed files with 79 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -503,16 +503,53 @@ int format_parse_param(const struct spa_pod *param, struct sample_spec *ss, stru
const struct spa_pod *format_build_param(struct spa_pod_builder *b, uint32_t id,
const struct sample_spec *spec, const struct channel_map *map)
{
struct spa_audio_info_raw info;
struct spa_pod_frame f;
info = SPA_AUDIO_INFO_RAW_INIT(
.format = spec->format,
.channels = spec->channels,
.rate = spec->rate);
if (map)
channel_map_to_positions(map, info.position);
spa_pod_builder_push_object(b, &f, SPA_TYPE_OBJECT_Format, id);
spa_pod_builder_add(b,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
0);
if (spec->format != SPA_AUDIO_FORMAT_UNKNOWN)
spa_pod_builder_add(b,
SPA_FORMAT_AUDIO_format, SPA_POD_Id(spec->format), 0);
else {
spa_pod_builder_add(b,
SPA_FORMAT_AUDIO_format, SPA_POD_CHOICE_ENUM_Id(26,
SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F32_OE,
SPA_AUDIO_FORMAT_S32,
SPA_AUDIO_FORMAT_S32_OE,
SPA_AUDIO_FORMAT_S24_32,
SPA_AUDIO_FORMAT_S24_32_OE,
SPA_AUDIO_FORMAT_S24,
SPA_AUDIO_FORMAT_S24_OE,
SPA_AUDIO_FORMAT_S16,
SPA_AUDIO_FORMAT_S16_OE,
SPA_AUDIO_FORMAT_ULAW,
SPA_AUDIO_FORMAT_ALAW,
SPA_AUDIO_FORMAT_U8),
0);
return spa_format_audio_raw_build(b, id, &info);
}
if (spec->rate != 0)
spa_pod_builder_add(b,
SPA_FORMAT_AUDIO_rate, SPA_POD_Int(spec->rate), 0);
if (spec->channels != 0) {
spa_pod_builder_add(b,
SPA_FORMAT_AUDIO_channels, SPA_POD_Int(spec->channels), 0);
if (map && map->channels == spec->channels) {
uint32_t positions[SPA_AUDIO_MAX_CHANNELS];
channel_map_to_positions(map, positions);
spa_pod_builder_add(b, SPA_FORMAT_AUDIO_position,
SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id,
spec->channels, positions), 0);
}
}
return spa_pod_builder_pop(b, &f);
}
int format_info_from_spec(struct format_info *info, const struct sample_spec *ss,

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

@ -1045,7 +1045,8 @@ static void stream_param_changed(void *data, uint32_t id, const struct spa_pod *
return;
}
pw_log_info("[%s] got rate:%u channels:%u", stream->client->name,
pw_log_info("[%s] got format:%s rate:%u channels:%u", stream->client->name,
format_id2name(stream->ss.format),
stream->ss.rate, stream->ss.channels);
stream->frame_size = sample_spec_frame_size(&stream->ss);
@ -1518,13 +1519,22 @@ static int do_create_playback_stream(struct client *client, uint32_t command, ui
}
}
if (sample_spec_valid(&ss)) {
if (fix_format)
ss.format = SPA_AUDIO_FORMAT_UNKNOWN;
if (fix_rate)
ss.rate = 0;
if (fix_channels)
ss.channels = 0;
if (fix_format || fix_rate || fix_channels) {
struct sample_spec sfix = ss;
if (fix_format)
sfix.format = SPA_AUDIO_FORMAT_UNKNOWN;
if (fix_rate)
sfix.rate = 0;
if (fix_channels)
sfix.channels = 0;
if (n_params < MAX_FORMATS &&
(params[n_params] = format_build_param(&b,
SPA_PARAM_EnumFormat, &sfix,
sfix.channels > 0 ? &map : NULL)) != NULL) {
n_params++;
n_valid_formats++;
}
}
if (n_params < MAX_FORMATS &&
(params[n_params] = format_build_param(&b,
SPA_PARAM_EnumFormat, &ss,
@ -1773,13 +1783,22 @@ static int do_create_record_stream(struct client *client, uint32_t command, uint
volume_set = false;
}
if (sample_spec_valid(&ss)) {
if (fix_format)
ss.format = SPA_AUDIO_FORMAT_UNKNOWN;
if (fix_rate)
ss.rate = 0;
if (fix_channels)
ss.channels = 0;
if (fix_format || fix_rate || fix_channels) {
struct sample_spec sfix = ss;
if (fix_format)
sfix.format = SPA_AUDIO_FORMAT_UNKNOWN;
if (fix_rate)
sfix.rate = 0;
if (fix_channels)
sfix.channels = 0;
if (n_params < MAX_FORMATS &&
(params[n_params] = format_build_param(&b,
SPA_PARAM_EnumFormat, &sfix,
sfix.channels > 0 ? &map : NULL)) != NULL) {
n_params++;
n_valid_formats++;
}
}
if (n_params < MAX_FORMATS &&
(params[n_params] = format_build_param(&b,
SPA_PARAM_EnumFormat, &ss,