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

pulse-server: increase channel name length

Browse source 
, and AUX11 and the \0 need at least 8 chars, 6 chars will truncate
after AUX1 and leave an invalid channel map.
This commit is contained in:
Wim Taymans 2021-12-22 21:15:46 +01:00
parent c1a0a602a5
commit 2905635de3
7 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-protocol-pulse/modules/module-ladspa-sink.c
View file

@ -160,9 +160,9 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert
uint32_t i; uint32_t i;
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 6); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",", p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

4
src/modules/module-protocol-pulse/modules/module-ladspa-source.c
View file

@ -160,9 +160,9 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert
uint32_t i; uint32_t i;
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 6); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",", p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

4
src/modules/module-protocol-pulse/modules/module-null-sink.c
View file

@ -177,9 +177,9 @@ struct module *create_module_null_sink(struct impl *impl, const char *argument)
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info.channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info.channels);
p = s = alloca(info.channels * 6); p = s = alloca(info.channels * 8);
for (i = 0; i < info.channels; i++) for (i = 0; i < info.channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",", p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info.position[i])); channel_id2name(info.position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

4
src/modules/module-protocol-pulse/modules/module-remap-sink.c
View file

@ -139,9 +139,9 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert
uint32_t i; uint32_t i;
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 6); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",", p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

4
src/modules/module-protocol-pulse/modules/module-remap-source.c
View file

@ -139,9 +139,9 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert
uint32_t i; uint32_t i;
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 6); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",", p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

4
src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
View file

@ -144,9 +144,9 @@ static void audio_info_to_props(struct spa_audio_info_raw *info, struct pw_prope
uint32_t i; uint32_t i;
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 6); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",", p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

4
src/modules/module-protocol-pulse/modules/module-tunnel-source.c
View file

@ -144,9 +144,9 @@ static void audio_info_to_props(struct spa_audio_info_raw *info, struct pw_prope
uint32_t i; uint32_t i;
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 6); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",", p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }