From 296abbf7ca8a92fc47bbe0b1bd8769c1fb381c2b Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Mon, 3 Nov 2025 21:44:25 +0200 Subject: [PATCH] bluez5: fix wrong use of SPA_POD_CHOICE_ENUM_Int SPA_POD_CHOICE_ENUM_Int must always take at least 2 values as first one is default. (Just 1 value no longer works on current master, and it's anyway incorrect.) Replace with just SPA_POD_Int, as there's just one choice. --- spa/plugins/bluez5/hfp-codec-cvsd.c | 2 +- spa/plugins/bluez5/hfp-codec-lc3-a127.c | 2 +- spa/plugins/bluez5/hfp-codec-lc3-swb.c | 2 +- spa/plugins/bluez5/hfp-codec-msbc.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spa/plugins/bluez5/hfp-codec-cvsd.c b/spa/plugins/bluez5/hfp-codec-cvsd.c index 19f908188..f7dc22cf9 100644 --- a/spa/plugins/bluez5/hfp-codec-cvsd.c +++ b/spa/plugins/bluez5/hfp-codec-cvsd.c @@ -47,7 +47,7 @@ static int codec_enum_config(const struct media_codec *codec, uint32_t flags, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), SPA_FORMAT_AUDIO_format, SPA_POD_Id(SPA_AUDIO_FORMAT_S16_LE), - SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_ENUM_Int(1, 8000), + SPA_FORMAT_AUDIO_rate, SPA_POD_Int(8000), SPA_FORMAT_AUDIO_channels, SPA_POD_Int(channels), SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, channels, position), diff --git a/spa/plugins/bluez5/hfp-codec-lc3-a127.c b/spa/plugins/bluez5/hfp-codec-lc3-a127.c index b10bba874..890798204 100644 --- a/spa/plugins/bluez5/hfp-codec-lc3-a127.c +++ b/spa/plugins/bluez5/hfp-codec-lc3-a127.c @@ -52,7 +52,7 @@ static int codec_enum_config(const struct media_codec *codec, uint32_t flags, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), SPA_FORMAT_AUDIO_format, SPA_POD_Id(SPA_AUDIO_FORMAT_F32), - SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_ENUM_Int(1, 24000), + SPA_FORMAT_AUDIO_rate, SPA_POD_Int(24000), SPA_FORMAT_AUDIO_channels, SPA_POD_Int(channels), SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, channels, position), diff --git a/spa/plugins/bluez5/hfp-codec-lc3-swb.c b/spa/plugins/bluez5/hfp-codec-lc3-swb.c index 1cd679958..cb2bd5474 100644 --- a/spa/plugins/bluez5/hfp-codec-lc3-swb.c +++ b/spa/plugins/bluez5/hfp-codec-lc3-swb.c @@ -55,7 +55,7 @@ static int codec_enum_config(const struct media_codec *codec, uint32_t flags, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), SPA_FORMAT_AUDIO_format, SPA_POD_Id(SPA_AUDIO_FORMAT_F32), - SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_ENUM_Int(1, 32000), + SPA_FORMAT_AUDIO_rate, SPA_POD_Int(32000), SPA_FORMAT_AUDIO_channels, SPA_POD_Int(channels), SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, channels, position), diff --git a/spa/plugins/bluez5/hfp-codec-msbc.c b/spa/plugins/bluez5/hfp-codec-msbc.c index 5175a68d7..13cb32b63 100644 --- a/spa/plugins/bluez5/hfp-codec-msbc.c +++ b/spa/plugins/bluez5/hfp-codec-msbc.c @@ -62,7 +62,7 @@ static int codec_enum_config(const struct media_codec *codec, uint32_t flags, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), SPA_FORMAT_AUDIO_format, SPA_POD_Id(SPA_AUDIO_FORMAT_S16), - SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_ENUM_Int(1, 16000), + SPA_FORMAT_AUDIO_rate, SPA_POD_Int(16000), SPA_FORMAT_AUDIO_channels, SPA_POD_Int(channels), SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, channels, position),