From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
This adds support for Location, SupportedContext, Context and QoS
properties.
---
profiles/audio/bap.c | 409 ++++++++++++++++++++++++++++---------------
1 file changed, 272 insertions(+), 137 deletions(-)
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index ed02db40be8c..18872329d4ac 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -263,6 +263,88 @@ static gboolean get_device(const GDBusPropertyTable *property,
return TRUE;
}
+static gboolean get_locations(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bap_ep *ep = data;
+ uint32_t locations = bt_bap_pac_get_locations(ep->rpac);
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &locations);
+
+ return TRUE;
+}
+
+static gboolean get_supported_context(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bap_ep *ep = data;
+ uint16_t context = bt_bap_pac_get_supported_context(ep->rpac);
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &context);
+
+ return TRUE;
+}
+
+static gboolean get_context(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bap_ep *ep = data;
+ uint16_t context = bt_bap_pac_get_context(ep->rpac);
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &context);
+
+ return TRUE;
+}
+
+static gboolean qos_exists(const GDBusPropertyTable *property, void *data)
+{
+ struct bap_ep *ep = data;
+ struct bt_bap_pac_qos *qos;
+
+ qos = bt_bap_pac_get_qos(ep->rpac);
+ if (!qos)
+ return FALSE;
+
+ return TRUE;
+}
+
+static gboolean get_qos(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bap_ep *ep = data;
+ struct bt_bap_pac_qos *qos;
+ DBusMessageIter dict;
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
+ DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_STRING_AS_STRING
+ DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
+ &dict);
+
+ qos = bt_bap_pac_get_qos(ep->rpac);
+ if (!qos)
+ return FALSE;
+
+ dict_append_entry(&dict, "Framing", DBUS_TYPE_BYTE, &qos->framing);
+ dict_append_entry(&dict, "PHY", DBUS_TYPE_BYTE, &qos->phy);
+ dict_append_entry(&dict, "Retransmissions", DBUS_TYPE_BYTE, &qos->rtn);
+ dict_append_entry(&dict, "MaximumLatency", DBUS_TYPE_UINT16,
+ &qos->latency);
+ dict_append_entry(&dict, "MimimumDelay", DBUS_TYPE_UINT32,
+ &qos->pd_min);
+ dict_append_entry(&dict, "MaximumDelay", DBUS_TYPE_UINT32,
+ &qos->pd_max);
+ dict_append_entry(&dict, "PreferredMimimumDelay", DBUS_TYPE_UINT32,
+ &qos->ppd_min);
+ dict_append_entry(&dict, "PreferredMaximumDelay", DBUS_TYPE_UINT32,
+ &qos->ppd_max);
+
+ dbus_message_iter_close_container(iter, &dict);
+
+ return TRUE;
+}
+
static const GDBusPropertyTable ep_properties[] = {
{ "UUID", "s", get_uuid, NULL, NULL,
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
@@ -272,6 +354,14 @@ static const GDBusPropertyTable ep_properties[] = {
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
{ "Device", "o", get_device, NULL, NULL,
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Locations", "u", get_locations, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "SupportedContext", "q", get_supported_context, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Context", "q", get_context, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "QoS", "a{sv}", get_qos, NULL, qos_exists,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
{ }
};
@@ -388,16 +478,182 @@ static bool parse_base(void *data, size_t len, util_debug_func_t func,
return true;
}
-static int parse_properties(DBusMessageIter *props, struct iovec **caps,
+static int parse_io_qos(const char *key, int var, DBusMessageIter *iter,
+ struct bt_bap_io_qos *qos)
+{
+ if (!strcasecmp(key, "Interval")) {
+ if (var != DBUS_TYPE_UINT32)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->interval);
+ } else if (!strcasecmp(key, "PHY")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->phy);
+ } else if (!strcasecmp(key, "SDU")) {
+ if (var != DBUS_TYPE_UINT16)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->sdu);
+ } else if (!strcasecmp(key, "Retransmissions")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->rtn);
+ } else if (!strcasecmp(key, "Latency")) {
+ if (var != DBUS_TYPE_UINT16)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->latency);
+ }
+
+ return 0;
+}
+
+static int parse_ucast_qos(const char *key, int var, DBusMessageIter *iter,
+ struct bt_bap_qos *qos)
+{
+ if (!strcasecmp(key, "CIG")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->ucast.cig_id);
+ } else if (!strcasecmp(key, "CIS")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->ucast.cis_id);
+ } else if (!strcasecmp(key, "Framing")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->ucast.framing);
+ } else if (!strcasecmp(key, "PresentationDelay")) {
+ if (var != DBUS_TYPE_UINT32)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->ucast.delay);
+ } else if (!strcasecmp(key, "TargetLatency")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->ucast.target_latency);
+ } else {
+ int err;
+
+ err = parse_io_qos(key, var, iter, &qos->ucast.io_qos);
+ if (err)
+ return err;
+ }
+
+ return 0;
+}
+
+static int parse_bcast_qos(const char *key, int var, DBusMessageIter *iter,
+ struct bt_bap_qos *qos)
+{
+ if (!strcasecmp(key, "Encryption")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->bcast.encryption);
+ } else if (!strcasecmp(key, "Options")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->bcast.options);
+ } else if (!strcasecmp(key, "Skip")) {
+ if (var != DBUS_TYPE_UINT16)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->bcast.skip);
+ } else if (!strcasecmp(key, "SyncTimeout")) {
+ if (var != DBUS_TYPE_UINT16)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->bcast.sync_timeout);
+ } else if (!strcasecmp(key, "SyncType")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->bcast.sync_cte_type);
+ } else if (!strcasecmp(key, "SyncFactor")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->bcast.sync_factor);
+ } else if (!strcasecmp(key, "MSE")) {
+ if (var != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->bcast.mse);
+ } else if (!strcasecmp(key, "Timeout")) {
+ if (var != DBUS_TYPE_UINT16)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(iter, &qos->bcast.timeout);
+ } else if (!strcasecmp(key, "BCode")) {
+ if (var != DBUS_TYPE_ARRAY)
+ return -EINVAL;
+
+ parse_array(iter, &qos->bcast.bcode);
+ } else {
+ int err;
+
+ err = parse_io_qos(key, var, iter, &qos->bcast.io_qos);
+ if (err)
+ return err;
+ }
+
+ return 0;
+}
+
+static int parse_qos(DBusMessageIter *iter, struct bt_bap_qos *qos,
+ struct iovec **base)
+{
+ DBusMessageIter array;
+ const char *key;
+ int (*parser)(const char *key, int var, DBusMessageIter *iter,
+ struct bt_bap_qos *qos);
+
+ if (*base)
+ parser = parse_bcast_qos;
+ else
+ parser = parse_ucast_qos;
+
+ dbus_message_iter_recurse(iter, &array);
+
+ while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter value, entry;
+ int var, err;
+
+ dbus_message_iter_recurse(&array, &entry);
+ dbus_message_iter_get_basic(&entry, &key);
+
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &value);
+
+ var = dbus_message_iter_get_arg_type(&value);
+
+ err = parser(key, var, &value, qos);
+ if (err) {
+ DBG("Failed parsing %s", key);
+ return err;
+ }
+
+ dbus_message_iter_next(&array);
+ }
+
+ return 0;
+}
+
+static int parse_configuration(DBusMessageIter *props, struct iovec **caps,
struct iovec **metadata, struct iovec **base,
struct bt_bap_qos *qos)
{
const char *key;
- struct bt_bap_io_qos io_qos;
- uint8_t framing = 0;
- bool broadcast = false;
- memset(&io_qos, 0, sizeof(io_qos));
while (dbus_message_iter_get_arg_type(props) == DBUS_TYPE_DICT_ENTRY) {
DBusMessageIter value, entry;
int var;
@@ -422,149 +678,26 @@ static int parse_properties(DBusMessageIter *props, struct iovec **caps,
if (parse_array(&value, metadata))
goto fail;
- } else if (!strcasecmp(key, "CIG")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &qos->ucast.cig_id);
- } else if (!strcasecmp(key, "BIG")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &qos->bcast.big);
- } else if (!strcasecmp(key, "CIS")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &qos->ucast.cis_id);
- } else if (!strcasecmp(key, "BIS")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &qos->bcast.bis);
- } else if (!strcasecmp(key, "Interval")) {
- if (var != DBUS_TYPE_UINT32)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &io_qos.interval);
- } else if (!strcasecmp(key, "Framing")) {
- dbus_bool_t val;
-
- if (var != DBUS_TYPE_BOOLEAN)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &val);
-
- framing = val;
- } else if (!strcasecmp(key, "PHY")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &io_qos.phy);
- } else if (!strcasecmp(key, "SDU")) {
- if (var != DBUS_TYPE_UINT16)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &io_qos.sdu);
- } else if (!strcasecmp(key, "Retransmissions")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &io_qos.rtn);
- } else if (!strcasecmp(key, "Latency")) {
- if (var != DBUS_TYPE_UINT16)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &io_qos.latency);
- } else if (!strcasecmp(key, "Delay")) {
- if (var != DBUS_TYPE_UINT32)
- goto fail;
-
- dbus_message_iter_get_basic(&value, &qos->ucast.delay);
- } else if (!strcasecmp(key, "TargetLatency")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->ucast.target_latency);
- } else if (!strcasecmp(key, "Encryption")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->bcast.encryption);
- broadcast = true;
- } else if (!strcasecmp(key, "Options")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->bcast.options);
- } else if (!strcasecmp(key, "Skip")) {
- if (var != DBUS_TYPE_UINT16)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->bcast.skip);
- } else if (!strcasecmp(key, "SyncTimeout")) {
- if (var != DBUS_TYPE_UINT16)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->bcast.sync_timeout);
- } else if (!strcasecmp(key, "SyncCteType")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->bcast.sync_cte_type);
-
- } else if (!strcasecmp(key, "SyncInterval")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->bcast.sync_factor);
- } else if (!strcasecmp(key, "MSE")) {
- if (var != DBUS_TYPE_BYTE)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->bcast.mse);
- } else if (!strcasecmp(key, "Timeout")) {
- if (var != DBUS_TYPE_UINT16)
- goto fail;
-
- dbus_message_iter_get_basic(&value,
- &qos->bcast.timeout);
- } else if (!strcasecmp(key, "BCode")) {
+ } else if (!strcasecmp(key, "QoS")) {
if (var != DBUS_TYPE_ARRAY)
goto fail;
- parse_array(&value, &qos->bcast.bcode);
+
+ if (parse_qos(&value, qos, base))
+ goto fail;
}
dbus_message_iter_next(props);
}
- if (broadcast) {
+ if (*base) {
uint32_t presDelay;
uint8_t numSubgroups, numBis;
struct bt_bap_codec codec;
- memcpy(&qos->bcast.io_qos, &io_qos, sizeof(io_qos));
- qos->bcast.framing = framing;
-
- if (!base)
- return 0;
- if (!(*base))
- *base = new0(struct iovec, 1);
util_iov_memcpy(*base, (*caps)->iov_base, (*caps)->iov_len);
parse_base((*caps)->iov_base, (*caps)->iov_len, bap_debug,
&presDelay, &numSubgroups, &numBis, &codec,
caps, NULL);
- } else {
- memcpy(&qos->ucast.io_qos, &io_qos, sizeof(io_qos));
- qos->ucast.framing = framing;
}
return 0;
@@ -686,9 +819,9 @@ static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg,
ep->qos.ucast.cis_id = BT_ISO_QOS_CIS_UNSET;
}
- if (parse_properties(&props, &ep->caps, &ep->metadata,
+ if (parse_configuration(&props, &ep->caps, &ep->metadata,
&ep->base, &ep->qos) < 0) {
- DBG("Unable to parse properties");
+ DBG("Unable to parse configuration");
return btd_error_invalid_args(msg);
}
@@ -855,7 +988,7 @@ static bool match_data_bap_data(const void *data, const void *match_data)
static const GDBusMethodTable ep_methods[] = {
{ GDBUS_EXPERIMENTAL_ASYNC_METHOD("SetConfiguration",
GDBUS_ARGS({ "endpoint", "o" },
- { "properties", "a{sv}" } ),
+ { "Configuration", "a{sv}" } ),
NULL, set_configuration) },
{ },
};
@@ -931,11 +1064,13 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
switch (bt_bap_pac_get_type(rpac)) {
case BT_BAP_BCAST_SINK:
err = asprintf(&ep->path, "%s/pac_%s%d",
- adapter_get_path(adapter), suffix, i);
+ adapter_get_path(adapter), suffix, i);
+ ep->base = new0(struct iovec, 1);
break;
case BT_BAP_BCAST_SOURCE:
err = asprintf(&ep->path, "%s/pac_%s%d",
device_get_path(device), suffix, i);
+ ep->base = new0(struct iovec, 1);
break;
}
--
2.41.0
