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: implement fix_* fields

Browse source 
Use wildcards for the format/rate/channels when the fix flags are
set in the client.

See #1912
This commit is contained in:
Wim Taymans 2021-12-16 12:24:59 +01:00
parent ee0fcf05c1
commit 12cc3b34b1
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
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_debug("%p: got rate:%u channels:%u", stream, stream->ss.rate, stream->ss.channels);
pw_log_info("[%s] got rate:%u channels:%u", stream->client->name,
stream->ss.rate, stream->ss.channels);
stream->frame_size = sample_spec_frame_size(&stream->ss);
if (stream->frame_size == 0) {
@ -1517,9 +1518,17 @@ 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 (n_params < MAX_FORMATS &&
(params[n_params] = format_build_param(&b,
SPA_PARAM_EnumFormat, &ss, &map)) != NULL) {
SPA_PARAM_EnumFormat, &ss,
ss.channels > 0 ? &map : NULL)) != NULL) {
n_params++;
n_valid_formats++;
} else {
@ -1764,9 +1773,17 @@ 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 (n_params < MAX_FORMATS &&
(params[n_params] = format_build_param(&b,
SPA_PARAM_EnumFormat, &ss, &map)) != NULL) {
SPA_PARAM_EnumFormat, &ss,
ss.channels > 0 ? &map : NULL)) != NULL) {
n_params++;
n_valid_formats++;
} else {