summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorFrédéric Danis <frederic.danis@collabora.com>2022-08-30 16:47:32 +0200
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2022-08-30 13:31:01 -0700
commiteb62d17e26f6ee6eb489fe9663494233b5480c6e (patch)
tree35e70e9637f96f3ab5416db9b8155abaa0d8cf00 /profiles
parentd297a5873d210df812369a03794f4faeac0bfe22 (diff)
downloadbluez-eb62d17e26f6ee6eb489fe9663494233b5480c6e.tar.gz
profiles: Add remote endpoint path to SelectProperties
This adds the remote endpoint path to the dictionary sent in SelectProperties. It allows audio application to know for which remote endpoint the call is done and so for which it should act as an initiator.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/audio/bap.c2
-rw-r--r--profiles/audio/media.c15
2 files changed, 14 insertions, 3 deletions
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index d388afe56..67aba3bd7 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -555,6 +555,8 @@ static struct bap_ep *ep_register(struct btd_service *service,
return NULL;
}
+ bt_bap_pac_set_user_data(rpac, ep->path);
+
DBG("ep %p lpac %p rpac %p path %s", ep, ep->lpac, ep->rpac, ep->path);
queue_push_tail(queue, ep);
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index ff3fa197b..85278a6d9 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -889,16 +889,20 @@ done:
data->cb(data->pac, err, caps, metadata, &qos, data->user_data);
}
-static int pac_select(struct bt_bap_pac *pac, struct bt_bap_pac_qos *qos,
- struct iovec *caps, struct iovec *metadata,
+static int pac_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac,
+ struct bt_bap_pac_qos *qos,
bt_bap_pac_select_t cb, void *cb_data, void *user_data)
{
struct media_endpoint *endpoint = user_data;
+ struct iovec *caps;
+ struct iovec *metadata;
+ const char *endpoint_path;
struct pac_select_data *data;
DBusMessage *msg;
DBusMessageIter iter, dict;
const char *key = "Capabilities";
+ bt_bap_pac_get_codec(rpac, NULL, &caps, &metadata);
if (!caps)
return -EINVAL;
@@ -911,7 +915,7 @@ static int pac_select(struct bt_bap_pac *pac, struct bt_bap_pac_qos *qos,
}
data = new0(struct pac_select_data, 1);
- data->pac = pac;
+ data->pac = lpac;
data->cb = cb;
data->user_data = cb_data;
@@ -919,6 +923,11 @@ static int pac_select(struct bt_bap_pac *pac, struct bt_bap_pac_qos *qos,
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &dict);
+ endpoint_path = bt_bap_pac_get_user_data(rpac);
+ if (endpoint_path)
+ g_dbus_dict_append_entry(&dict, "Endpoint",
+ DBUS_TYPE_OBJECT_PATH, &endpoint_path);
+
g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &key,
DBUS_TYPE_BYTE, &caps->iov_base,
caps->iov_len);