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

spa: parse the audio.position completetly

Browse source 
Parse the audio.position spec completely so that we have the right
number of channels but only store the first max_position channels.

Also rename some field to make it clear that this is about the max
number of channel positions.
This commit is contained in:
Wim Taymans 2025-10-22 12:47:00 +02:00
parent ae50bb5dc0
commit 6465a63bf6
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spa/include/spa/param/audio/raw-json.h
View file

@ -29,7 +29,7 @@ extern "C" {
SPA_API_AUDIO_RAW_JSON int
spa_audio_parse_position_n(const char *str, size_t len,
uint32_t *position, uint32_t max_channels, uint32_t *n_channels)
uint32_t *position, uint32_t max_position, uint32_t *n_channels)
{
struct spa_json iter;
char v[256];
@ -38,9 +38,10 @@ spa_audio_parse_position_n(const char *str, size_t len,
if (spa_json_begin_array_relax(&iter, str, len) <= 0)
return 0;
while (spa_json_get_string(&iter, v, sizeof(v)) > 0 &&
channels < max_channels) {
position[channels++] = spa_type_audio_channel_from_short_name(v);
while (spa_json_get_string(&iter, v, sizeof(v)) > 0) {
if (channels < max_position)
position[channels] = spa_type_audio_channel_from_short_name(v);
channels++;
}
*n_channels = channels;
return channels;