mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: fix build_profile index handling

Browse source 
The codec profiles come at profile indices after the no-codec profiles.
Make the codec clearer by not using magic numbers here.
This commit is contained in:
Pauli Virtanen 2022-10-09 20:54:06 +03:00 • committed by Wim Taymans
parent 9846e0cb7a
commit 7066aa7e15
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/bluez5/bluez5-device.c
View file

@ -74,6 +74,7 @@ enum {
DEVICE_PROFILE_A2DP = 2, DEVICE_PROFILE_A2DP = 2,
DEVICE_PROFILE_HSP_HFP = 3, DEVICE_PROFILE_HSP_HFP = 3,
DEVICE_PROFILE_BAP = 4, DEVICE_PROFILE_BAP = 4,
DEVICE_PROFILE_LAST = DEVICE_PROFILE_BAP,
}; };
struct props { struct props {
@ -1092,18 +1093,18 @@ static uint32_t get_profile_from_index(struct impl *this, uint32_t index, uint32
*codec = 0; *codec = 0;
*next = index + 1; *next = index + 1;
if (index <= 3) { if (index <= DEVICE_PROFILE_LAST) {
return index; return index;
} else if (index != SPA_ID_INVALID) { } else if (index != SPA_ID_INVALID) {
const struct spa_type_info *info; const struct spa_type_info *info;
uint32_t profile; uint32_t profile;
*codec = index - 3; *codec = index - DEVICE_PROFILE_LAST;
*next = SPA_ID_INVALID; *next = SPA_ID_INVALID;
for (info = spa_type_bluetooth_audio_codec; info->type; ++info) for (info = spa_type_bluetooth_audio_codec; info->type; ++info)
if (info->type > *codec) if (info->type > *codec)
*next = SPA_MIN(info->type + 3, *next); *next = SPA_MIN(info->type + DEVICE_PROFILE_LAST, *next);
if (get_hfp_codec(*codec)) if (get_hfp_codec(*codec))
profile = DEVICE_PROFILE_HSP_HFP; profile = DEVICE_PROFILE_HSP_HFP;
@ -1128,14 +1129,14 @@ static uint32_t get_index_from_profile(struct impl *this, uint32_t profile, enum
if (codec == 0 || (this->bt_dev->connected_profiles & SPA_BT_PROFILE_MEDIA_SOURCE)) if (codec == 0 || (this->bt_dev->connected_profiles & SPA_BT_PROFILE_MEDIA_SOURCE))
return profile; return profile;
return codec + 3; return codec + DEVICE_PROFILE_LAST;
} }
if (profile == DEVICE_PROFILE_HSP_HFP) { if (profile == DEVICE_PROFILE_HSP_HFP) {
if (codec == 0 || (this->bt_dev->connected_profiles & SPA_BT_PROFILE_HFP_AG)) if (codec == 0 || (this->bt_dev->connected_profiles & SPA_BT_PROFILE_HFP_AG))
return profile; return profile;
return codec + 3; return codec + DEVICE_PROFILE_LAST;
} }
return SPA_ID_INVALID; return SPA_ID_INVALID;