mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-18 06:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5-dbus: Track ASHA HiSyncId & Side information in transport

Browse source 
ASHA devices with the same HiSyncId are a pair and this
will be used later on to set them up together with a
combine sink like device set for BAP. Side information
is required for channel information when setting up the
combine sink.
This commit is contained in:
Sanchayan Maity 2025-01-16 17:21:03 +05:30 • committed by Wim Taymans
parent 612cbf5176
commit 8120493edb
2 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,6 +155,9 @@ struct spa_bt_remote_endpoint {
int capabilities_len; int capabilities_len;
bool delay_reporting; bool delay_reporting;
bool acceptor; bool acceptor;
bool asha_right_side;
uint64_t hisyncid;
}; };
#define METADATA_MAX_LEN 255 #define METADATA_MAX_LEN 255
@ -2720,6 +2723,12 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
free(remote_endpoint->transport_path); free(remote_endpoint->transport_path);
remote_endpoint->transport_path = strdup(value); remote_endpoint->transport_path = strdup(value);
} }
else if (spa_streq(key, "Side")) {
if (spa_streq(value, "right"))
remote_endpoint->asha_right_side = true;
else
remote_endpoint->asha_right_side = false;
}
} }
else if (type == DBUS_TYPE_BOOLEAN) { else if (type == DBUS_TYPE_BOOLEAN) {
int value; int value;
@ -2776,11 +2785,11 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
remote_endpoint->capabilities_len = len; remote_endpoint->capabilities_len = len;
} }
} }
/* HiSyncId property is present for ASHA */ /*
* HiSyncId property is present for ASHA. An ASHA "left" and
* "right" device pair will always have the same "HiSyncId".
*/
else if (spa_streq(key, "HiSyncId")) { else if (spa_streq(key, "HiSyncId")) {
/*
* TODO: Required for Stereo support in ASHA, for now just log.
*/
DBusMessageIter iter; DBusMessageIter iter;
uint8_t *value; uint8_t *value;
int len; int len;
@ -2791,7 +2800,12 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
dbus_message_iter_recurse(&it[1], &iter); dbus_message_iter_recurse(&it[1], &iter);
dbus_message_iter_get_fixed_array(&iter, &value, &len); dbus_message_iter_get_fixed_array(&iter, &value, &len);
spa_log_debug(monitor->log, "remote_endpoint %p: %s=%d", remote_endpoint, key, len); if (len != 8 /* HiSyncId will always be 8 bytes */)
goto next;
remote_endpoint->hisyncid = *(uint64_t *)value;
spa_log_debug(monitor->log, "remote_endpoint %p: %s=%zd", remote_endpoint, key, remote_endpoint->hisyncid);
} }
else else
spa_log_debug(monitor->log, "remote_endpoint %p: unhandled key %s", remote_endpoint, key); spa_log_debug(monitor->log, "remote_endpoint %p: unhandled key %s", remote_endpoint, key);
@ -4142,6 +4156,8 @@ static int setup_asha_transport(struct spa_bt_remote_endpoint *remote_endpoint,
transport->profile = SPA_BT_PROFILE_ASHA_SINK; transport->profile = SPA_BT_PROFILE_ASHA_SINK;
transport->media_codec = codec; transport->media_codec = codec;
transport->device = remote_endpoint->device; transport->device = remote_endpoint->device;
transport->hisyncid = remote_endpoint->hisyncid;
transport->asha_right_side = remote_endpoint->asha_right_side;
spa_list_append(&remote_endpoint->device->transport_list, &transport->device_link); spa_list_append(&remote_endpoint->device->transport_list, &transport->device_link);
@ -4157,7 +4173,8 @@ static int setup_asha_transport(struct spa_bt_remote_endpoint *remote_endpoint,
transport_sync_volume(transport); transport_sync_volume(transport);
spa_log_debug(monitor->log, "ASHA transport setup complete"); const char *side = transport->asha_right_side ? "right" : "left";
spa_log_debug(monitor->log, "ASHA transport setup complete for %s side", side);
return 0; return 0;
} }

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

@ -687,6 +687,10 @@ struct spa_bt_transport {
struct spa_hook_list listener_list; struct spa_hook_list listener_list;
struct spa_callbacks impl; struct spa_callbacks impl;
/* For ASHA */
bool asha_right_side;
uint64_t hisyncid;
/* user_data must be the last item in the struct */ /* user_data must be the last item in the struct */
void *user_data; void *user_data;
}; };