mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse: always use the default pulse channel map

Browse source 
This causes the least surprises when the channelmap is not
propagated correctly from pipewire.
This commit is contained in:
Wim Taymans 2020-09-17 12:37:57 +02:00
parent 8ee07c3c66
commit 1f9b0c75b7
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pipewire-pulseaudio/src/core-format.c
View file

@ -390,7 +390,7 @@ int pa_format_parse_param(const struct spa_pod *param, pa_sample_spec *spec, pa_
map->map[i] = channel_id2pa(info.info.raw.position[i], &aux); map->map[i] = channel_id2pa(info.info.raw.position[i], &aux);
if (!pa_channel_map_valid(map)) if (!pa_channel_map_valid(map))
pa_channel_map_init_extend(map, info.info.raw.channels, PA_CHANNEL_MAP_OSS); pa_channel_map_init_extend(map, info.info.raw.channels, PA_CHANNEL_MAP_DEFAULT);
return 0; return 0;
} }

14
pipewire-pulseaudio/src/introspect.c
View file

@ -126,7 +126,7 @@ static int sink_callback(pa_context *c, struct global *g, struct sink_data *d)
i.channel_map = g->node_info.channel_map; i.channel_map = g->node_info.channel_map;
else else
pa_channel_map_init_extend(&i.channel_map, pa_channel_map_init_extend(&i.channel_map,
i.sample_spec.channels, PA_CHANNEL_MAP_OSS); i.sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
i.owner_module = g->id; i.owner_module = g->id;
i.volume.channels = i.sample_spec.channels; i.volume.channels = i.sample_spec.channels;
for (n = 0; n < i.volume.channels; n++) for (n = 0; n < i.volume.channels; n++)
@ -857,7 +857,7 @@ static int source_callback(pa_context *c, struct global *g, struct source_data *
i.channel_map = g->node_info.channel_map; i.channel_map = g->node_info.channel_map;
else else
pa_channel_map_init_extend(&i.channel_map, pa_channel_map_init_extend(&i.channel_map,
i.sample_spec.channels, PA_CHANNEL_MAP_OSS); i.sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
i.owner_module = g->id; i.owner_module = g->id;
i.volume.channels = i.sample_spec.channels; i.volume.channels = i.sample_spec.channels;
for (n = 0; n < i.volume.channels; n++) for (n = 0; n < i.volume.channels; n++)
@ -1286,7 +1286,7 @@ static void server_callback(struct server_data *d, pa_context *c)
i.default_sink_name = get_default_name(c, PA_SUBSCRIPTION_MASK_SINK); i.default_sink_name = get_default_name(c, PA_SUBSCRIPTION_MASK_SINK);
i.default_source_name = get_default_name(c, PA_SUBSCRIPTION_MASK_SOURCE); i.default_source_name = get_default_name(c, PA_SUBSCRIPTION_MASK_SOURCE);
i.cookie = info->cookie; i.cookie = info->cookie;
pa_channel_map_init_extend(&i.channel_map, i.sample_spec.channels, PA_CHANNEL_MAP_OSS); pa_channel_map_init_extend(&i.channel_map, i.sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
d->cb(c, &i, d->userdata); d->cb(c, &i, d->userdata);
} }
@ -2064,7 +2064,7 @@ static int sink_input_callback(pa_context *c, struct sink_input_data *d, struct
i.channel_map = s->channel_map; i.channel_map = s->channel_map;
else else
pa_channel_map_init_extend(&i.channel_map, pa_channel_map_init_extend(&i.channel_map,
i.sample_spec.channels, PA_CHANNEL_MAP_OSS); i.sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
i.format = s->format; i.format = s->format;
} }
else { else {
@ -2077,7 +2077,7 @@ static int sink_input_callback(pa_context *c, struct sink_input_data *d, struct
i.channel_map = g->node_info.channel_map; i.channel_map = g->node_info.channel_map;
else else
pa_channel_map_init_extend(&i.channel_map, pa_channel_map_init_extend(&i.channel_map,
i.sample_spec.channels, PA_CHANNEL_MAP_OSS); i.sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
ii[0].encoding = PA_ENCODING_PCM; ii[0].encoding = PA_ENCODING_PCM;
ii[0].plist = pa_proplist_new(); ii[0].plist = pa_proplist_new();
i.format = ii; i.format = ii;
@ -2467,7 +2467,7 @@ static int source_output_callback(struct source_output_data *d, pa_context *c, s
i.channel_map = s->channel_map; i.channel_map = s->channel_map;
else else
pa_channel_map_init_extend(&i.channel_map, pa_channel_map_init_extend(&i.channel_map,
i.sample_spec.channels, PA_CHANNEL_MAP_OSS); i.sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
i.format = s->format; i.format = s->format;
} }
else { else {
@ -2480,7 +2480,7 @@ static int source_output_callback(struct source_output_data *d, pa_context *c, s
i.channel_map = g->node_info.channel_map; i.channel_map = g->node_info.channel_map;
else else
pa_channel_map_init_extend(&i.channel_map, pa_channel_map_init_extend(&i.channel_map,
i.sample_spec.channels, PA_CHANNEL_MAP_OSS); i.sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
ii[0].encoding = PA_ENCODING_PCM; ii[0].encoding = PA_ENCODING_PCM;
ii[0].plist = pa_proplist_new(); ii[0].plist = pa_proplist_new();
i.format = ii; i.format = ii;