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

audioconvert: handle unexpected channel positions

Browse source
This commit is contained in:
Wim Taymans 2021-02-16 12:24:14 +01:00
parent ef98361630
commit c160a063b9
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/audioconvert/merger.c
View file

@ -208,8 +208,14 @@ static int init_port(struct impl *this, enum spa_direction direction, uint32_t p
port->direction = direction; port->direction = direction;
port->id = port_id; port->id = port_id;
if (position < SPA_N_ELEMENTS(spa_type_audio_channel)) {
snprintf(port->position, 16, "%s", snprintf(port->position, 16, "%s",
spa_debug_type_short_name(spa_type_audio_channel[position].name)); spa_debug_type_short_name(spa_type_audio_channel[position].name));
} else if (position >= SPA_AUDIO_CHANNEL_CUSTOM_START) {
snprintf(port->position, 16, "AUX%d", position - SPA_AUDIO_CHANNEL_CUSTOM_START);
} else {
snprintf(port->position, 16, "UNK");
}
port->info_all = SPA_PORT_CHANGE_MASK_FLAGS | port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
SPA_PORT_CHANGE_MASK_PROPS | SPA_PORT_CHANGE_MASK_PROPS |

9
spa/plugins/audioconvert/splitter.c
View file

@ -157,9 +157,14 @@ static int init_port(struct impl *this, enum spa_direction direction,
port->direction = direction; port->direction = direction;
port->id = port_id; port->id = port_id;
snprintf(port->position, 7, "%s", if (position < SPA_N_ELEMENTS(spa_type_audio_channel)) {
snprintf(port->position, 16, "%s",
spa_debug_type_short_name(spa_type_audio_channel[position].name)); spa_debug_type_short_name(spa_type_audio_channel[position].name));
} else if (position >= SPA_AUDIO_CHANNEL_CUSTOM_START) {
snprintf(port->position, 16, "AUX%d", position - SPA_AUDIO_CHANNEL_CUSTOM_START);
} else {
snprintf(port->position, 16, "UNK");
}
port->info_all = SPA_PORT_CHANGE_MASK_FLAGS | port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
SPA_PORT_CHANGE_MASK_PROPS | SPA_PORT_CHANGE_MASK_PROPS |