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

stream: handle channelmap in _new_extended

Browse source
This commit is contained in:
Wim Taymans 2018-10-09 16:37:23 +02:00
parent a82a5dc26a
commit 1509b51966
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/stream.c
View file

@ -599,6 +599,11 @@ pa_stream* pa_stream_new(pa_context *c, const char *name, const pa_sample_spec *
pa_stream* pa_stream_new_with_proplist(pa_context *c, const char *name, pa_stream* pa_stream_new_with_proplist(pa_context *c, const char *name,
const pa_sample_spec *ss, const pa_channel_map *map, pa_proplist *p) const pa_sample_spec *ss, const pa_channel_map *map, pa_proplist *p)
{ {
pa_channel_map tmap;
if (!map)
PA_CHECK_VALIDITY_RETURN_NULL(c, map = pa_channel_map_init_auto(&tmap, ss->channels, PA_CHANNEL_MAP_DEFAULT), PA_ERR_INVALID);
return stream_new(c, name, ss, map, NULL, 0, p); return stream_new(c, name, ss, map, NULL, 0, p);
} }
@ -808,17 +813,18 @@ static int create_stream(pa_stream_direction_t direction,
} }
else { else {
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map chmap;
int i; int i;
for (i = 0; i < s->n_formats; i++) { for (i = 0; i < s->n_formats; i++) {
if ((res = pa_format_info_to_sample_spec(s->req_formats[i], &ss, NULL)) < 0) { if ((res = pa_format_info_to_sample_spec(s->req_formats[i], &ss, &chmap)) < 0) {
char buf[4096]; char buf[4096];
pw_log_warn("can't convert format %d %s", res, pw_log_warn("can't convert format %d %s", res,
pa_format_info_snprint(buf,4096,s->req_formats[i])); pa_format_info_snprint(buf,4096,s->req_formats[i]));
continue; continue;
} }
params[n_params++] = get_param(s, &ss, NULL, &b); params[n_params++] = get_param(s, &ss, &chmap, &b);
if (ss.rate > sample_rate) { if (ss.rate > sample_rate) {
sample_rate = ss.rate; sample_rate = ss.rate;
stride = pa_frame_size(&ss); stride = pa_frame_size(&ss);