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

bluez5: support BAP hardware volume

Browse source 
Support BAP HW volume now that it's implemented in BlueZ, with the
volume range 0-255 per spec.
This commit is contained in:
Pauli Virtanen 2025-01-25 10:04:12 +02:00 • committed by Wim Taymans
parent b72eed8f03
commit 34ac0d8256
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -220,7 +220,8 @@ struct spa_bt_media_codec_switch {
#define DEFAULT_RECONNECT_PROFILES SPA_BT_PROFILE_NULL
#define DEFAULT_HW_VOLUME_PROFILES (SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY | SPA_BT_PROFILE_HEADSET_HEAD_UNIT | \
SPA_BT_PROFILE_A2DP_SOURCE | SPA_BT_PROFILE_A2DP_SINK)
SPA_BT_PROFILE_A2DP_SOURCE | SPA_BT_PROFILE_A2DP_SINK | \
SPA_BT_PROFILE_BAP_AUDIO)
#define BT_DEVICE_DISCONNECTED 0
#define BT_DEVICE_CONNECTED 1
@ -3464,6 +3465,10 @@ static int transport_update_props(struct spa_bt_transport *transport,
t_volume = &transport->volumes[SPA_BT_VOLUME_ID_RX];
else if (transport->profile & SPA_BT_PROFILE_ASHA_SINK)
t_volume = &transport->volumes[SPA_BT_VOLUME_ID_TX];
else if (transport->profile & SPA_BT_PROFILE_BAP_SINK)
t_volume = &transport->volumes[SPA_BT_VOLUME_ID_TX];
else if (transport->profile & SPA_BT_PROFILE_BAP_SOURCE)
t_volume = &transport->volumes[SPA_BT_VOLUME_ID_RX];
else
goto next;
@ -3615,7 +3620,7 @@ static int transport_set_volume(void *data, int id, float volume)
if (!t_volume->active || !spa_bt_transport_volume_enabled(transport))
return -ENOTSUP;
value = spa_bt_volume_linear_to_hw(volume, 127);
value = spa_bt_volume_linear_to_hw(volume, t_volume->hw_volume_max);
t_volume->volume = volume;
/* AVRCP volume would not applied on remote sink device
@ -4695,7 +4700,10 @@ static DBusHandlerResult endpoint_set_configuration(DBusConnection *conn,
for (int i = 0; i < SPA_BT_VOLUME_ID_TERM; ++i) {
transport->volumes[i].hw_volume = SPA_BT_VOLUME_INVALID;
transport->volumes[i].hw_volume_max = SPA_BT_VOLUME_A2DP_MAX;
if (profile & SPA_BT_PROFILE_BAP_AUDIO)
transport->volumes[i].hw_volume_max = SPA_BT_VOLUME_BAP_MAX;
else
transport->volumes[i].hw_volume_max = SPA_BT_VOLUME_A2DP_MAX;
}
free(transport->endpoint_path);

1
spa/plugins/bluez5/defs.h
View file

@ -596,6 +596,7 @@ int spa_bt_sco_io_write(struct spa_bt_sco_io *io, uint8_t *data, int size);
#define SPA_BT_VOLUME_INVALID -1
#define SPA_BT_VOLUME_HS_MAX 15
#define SPA_BT_VOLUME_A2DP_MAX 127
#define SPA_BT_VOLUME_BAP_MAX 255
enum spa_bt_transport_state {
SPA_BT_TRANSPORT_STATE_ERROR = -1,