mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-02-21 01:40:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: add spa_audio_parse_position_n

Browse source 
Add a function that accepts the size of the position array when reading
the audio positions. This makes it possible to decouple the position
array size from SPA_AUDIO_MAX_CHANNELS.

Also use SPA_N_ELEMENTS to pass the number of array elements to
functions instead of a fixed constant. This makes it easier to change
the array size later to a different constant without having to patch up
all the places where the size is used.
This commit is contained in:
Wim Taymans 2025-10-20 15:16:54 +02:00
parent 9e7cae13df
commit 8bbca3b8f3
27 changed files with 84 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/alsa/alsa-acp-device.c
View file

@ -697,13 +697,13 @@ static int apply_device_props(struct impl *this, struct acp_device *dev, struct
break;
case SPA_PROP_channelVolumes:
if ((n_volumes = spa_pod_copy_array(&prop->value, SPA_TYPE_Float,
volumes, SPA_AUDIO_MAX_CHANNELS)) > 0) {
volumes, SPA_N_ELEMENTS(volumes))) > 0) {
changed++;
}
break;
case SPA_PROP_channelMap:
if (spa_pod_copy_array(&prop->value, SPA_TYPE_Id,
channels, SPA_AUDIO_MAX_CHANNELS) > 0) {
channels, SPA_N_ELEMENTS(channels)) > 0) {
changed++;
}
break;

2
spa/plugins/alsa/alsa-pcm.h
View file

@ -315,7 +315,7 @@ void spa_alsa_emit_port_info(struct state *state, bool full);
static inline void spa_alsa_parse_position(struct channel_map *map, const char *val, size_t len)
{
spa_audio_parse_position(val, len, map->pos, &map->channels);
spa_audio_parse_position_n(val, len, map->pos, SPA_N_ELEMENTS(map->pos), &map->channels);
}
static inline uint32_t spa_alsa_parse_rates(uint32_t *rates, uint32_t max, const char *val, size_t len)