| Message ID | 20231016065228.424400-1-kiran.k@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] profiles: Add support for Audio Locations | expand |
Hi, ma, 2023-10-16 kello 12:22 +0530, Kiran K kirjoitti: > This adds support to provide Audio Locations for BAP Sink and Source Endpoints > --- > profiles/audio/media.c | 25 +++++++++++++++++++++---- > 1 file changed, 21 insertions(+), 4 deletions(-) > > diff --git a/profiles/audio/media.c b/profiles/audio/media.c > index 1d98ac5a1a70..51e3ab65d12d 100644 > --- a/profiles/audio/media.c > +++ b/profiles/audio/media.c > @@ -99,6 +99,7 @@ struct media_endpoint { > size_t size; /* Endpoint capabilities size */ > uint8_t *metadata; /* Endpoint property metadata */ > size_t metadata_size; /* Endpoint metadata size */ > + uint32_t location; /* Endpoint location */ > guint hs_watch; > guint ag_watch; > guint watch; > @@ -1445,6 +1446,7 @@ media_endpoint_create(struct media_adapter *adapter, > int size, > uint8_t *metadata, > int metadata_size, > + uint32_t location, > int *err) > { > struct media_endpoint *endpoint; > @@ -1460,6 +1462,7 @@ media_endpoint_create(struct media_adapter *adapter, > endpoint->cid = cid; > endpoint->vid = vid; > endpoint->delay_reporting = delay_reporting; > + endpoint->location = location; > > if (qos) > endpoint->qos = *qos; > @@ -1525,7 +1528,8 @@ static int parse_properties(DBusMessageIter *props, const char **uuid, > uint16_t *cid, uint16_t *vid, > struct bt_bap_pac_qos *qos, > uint8_t **capabilities, int *size, > - uint8_t **metadata, int *metadata_size) > + uint8_t **metadata, int *metadata_size, > + uint32_t *location) > { > gboolean has_uuid = FALSE; > gboolean has_codec = FALSE; > @@ -1609,6 +1613,10 @@ static int parse_properties(DBusMessageIter *props, const char **uuid, > if (var != DBUS_TYPE_UINT16) > return -EINVAL; > dbus_message_iter_get_basic(&value, &qos->ppd_max); > + } else if (strcasecmp(key, "Location") == 0) { This should be "Locations" to match the documented endpoint property names. Maybe also the variable names. The bitmap can contain multiple supported locations, the client will selects in Config Codec which ones it wants. > + if (var != DBUS_TYPE_UINT32) > + return -EINVAL; > + dbus_message_iter_get_basic(&value, location); > } > > dbus_message_iter_next(props); > @@ -1633,6 +1641,7 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg, > int size = 0; > int metadata_size = 0; > int err; > + uint32_t location; > > sender = dbus_message_get_sender(msg); > > @@ -1650,12 +1659,12 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg, > > if (parse_properties(&props, &uuid, &delay_reporting, &codec, &cid, > &vid, &qos, &capabilities, &size, &metadata, > - &metadata_size) < 0) > + &metadata_size, &location) < 0) > return btd_error_invalid_args(msg); > > if (media_endpoint_create(adapter, sender, path, uuid, delay_reporting, > codec, cid, vid, &qos, capabilities, > - size, metadata, metadata_size, > + size, metadata, metadata_size, location, > &err) == NULL) { > if (err == -EPROTONOSUPPORT) > return btd_error_not_supported(msg); > @@ -2688,6 +2697,7 @@ static void app_register_endpoint(void *data, void *user_data) > int size = 0; > uint8_t *metadata = NULL; > int metadata_size = 0; > + uint32_t location; > DBusMessageIter iter, array; > struct media_endpoint *endpoint; > > @@ -2748,6 +2758,13 @@ static void app_register_endpoint(void *data, void *user_data) > &metadata_size); > } > > + if (g_dbus_proxy_get_property(proxy, "Location", &iter)) { Same here. > + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) > + goto fail; > + > + dbus_message_iter_get_basic(&iter, &location); > + } > + > /* Parse QoS preferences */ > memset(&qos, 0, sizeof(qos)); > if (g_dbus_proxy_get_property(proxy, "Framing", &iter)) { > @@ -2804,7 +2821,7 @@ static void app_register_endpoint(void *data, void *user_data) > vendor.cid, vendor.vid, &qos, > capabilities, size, > metadata, metadata_size, > - &app->err); > + location, &app->err); > if (!endpoint) { > error("Unable to register endpoint %s:%s: %s", app->sender, > path, strerror(-app->err));
Hi Kiran, On Sun, Oct 15, 2023 at 11:40 PM Kiran K <kiran.k@intel.com> wrote: > > This adds support to provide Audio Locations for BAP Sink and Source Endpoints > --- > profiles/audio/media.c | 2 +- > src/shared/bap.c | 56 ++++++++++++++++++++++++++++++++---------- > src/shared/bap.h | 6 +++-- > 3 files changed, 48 insertions(+), 16 deletions(-) > > diff --git a/profiles/audio/media.c b/profiles/audio/media.c > index 51e3ab65d12d..d063bbf11cf9 100644 > --- a/profiles/audio/media.c > +++ b/profiles/audio/media.c > @@ -1250,7 +1250,7 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type, > > endpoint->pac = bt_bap_add_vendor_pac(db, name, type, endpoint->codec, > endpoint->cid, endpoint->vid, &endpoint->qos, > - &data, metadata); > + &data, metadata, endpoint->location); > if (!endpoint->pac) { > error("Unable to create PAC"); > free(metadata); > diff --git a/src/shared/bap.c b/src/shared/bap.c > index 925501c48d98..bee19039900f 100644 > --- a/src/shared/bap.c > +++ b/src/shared/bap.c > @@ -190,6 +190,7 @@ struct bt_bap_pac { > uint8_t type; > struct bt_bap_codec codec; > struct bt_bap_pac_qos qos; > + uint32_t location; > struct iovec *data; > struct iovec *metadata; > struct bt_bap_pac_ops *ops; > @@ -368,6 +369,14 @@ static void pac_foreach(void *data, void *user_data) > meta->len = 0; > } > > +static void get_pac_loc(void *data, void *user_data) > +{ > + struct bt_bap_pac *pac = data; > + uint32_t *location = user_data; > + > + *location |= pac->location; > +} > + > static void pacs_sink_read(struct gatt_db_attribute *attrib, > unsigned int id, uint16_t offset, > uint8_t opcode, struct bt_att *att, > @@ -395,7 +404,15 @@ static void pacs_sink_loc_read(struct gatt_db_attribute *attrib, > void *user_data) > { > struct bt_pacs *pacs = user_data; > - uint32_t value = cpu_to_le32(pacs->sink_loc_value); > + struct bt_bap_db *bdb = pacs->bdb; > + uint32_t value; > + > + queue_foreach(bdb->sinks, get_pac_loc, &pacs->sink_loc_value); > + if (pacs->sink_loc_value) > + value = cpu_to_le32(pacs->sink_loc_value); > + else > + /* Set default value */ > + value = cpu_to_le32(PACS_SNK_LOCATION); > > gatt_db_attribute_read_result(attrib, id, 0, (void *) &value, > sizeof(value)); > @@ -428,7 +445,15 @@ static void pacs_source_loc_read(struct gatt_db_attribute *attrib, > void *user_data) > { > struct bt_pacs *pacs = user_data; > - uint32_t value = cpu_to_le32(pacs->source_loc_value); > + struct bt_bap_db *bdb = pacs->bdb; > + uint32_t value; > + > + queue_foreach(bdb->sources, get_pac_loc, &pacs->source_loc_value); > + if (pacs->source_loc_value) > + value = cpu_to_le32(pacs->source_loc_value); > + else > + /* Set default value */ > + value = cpu_to_le32(PACS_SRC_LOCATION); > > gatt_db_attribute_read_result(attrib, id, 0, (void *) &value, > sizeof(value)); > @@ -474,9 +499,8 @@ static struct bt_pacs *pacs_new(struct gatt_db *db) > > pacs = new0(struct bt_pacs, 1); > > - /* Set default values */ > - pacs->sink_loc_value = PACS_SNK_LOCATION; > - pacs->source_loc_value = PACS_SRC_LOCATION; > + pacs->sink_loc_value = 0; > + pacs->source_loc_value = 0; > pacs->sink_context_value = PACS_SNK_CTXT; > pacs->source_context_value = PACS_SRC_CTXT; > pacs->supported_sink_context_value = PACS_SUPPORTED_SNK_CTXT; > @@ -2451,7 +2475,8 @@ static struct bt_bap_pac *bap_pac_new(struct bt_bap_db *bdb, const char *name, > struct bt_bap_codec *codec, > struct bt_bap_pac_qos *qos, > struct iovec *data, > - struct iovec *metadata) > + struct iovec *metadata, > + uint32_t location) > { > struct bt_bap_pac *pac; > > @@ -2468,6 +2493,8 @@ static struct bt_bap_pac *bap_pac_new(struct bt_bap_db *bdb, const char *name, > if (qos) > pac->qos = *qos; > > + pac->location = location; > + > return pac; > } > > @@ -2679,7 +2706,8 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, > uint8_t id, uint16_t cid, uint16_t vid, > struct bt_bap_pac_qos *qos, > struct iovec *data, > - struct iovec *metadata) > + struct iovec *metadata, > + uint32_t location) > { > struct bt_bap_db *bdb; > struct bt_bap_pac *pac, *pac_broadcast_sink; > @@ -2699,7 +2727,8 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, > codec.cid = cid; > codec.vid = vid; > > - pac = bap_pac_new(bdb, name, type, &codec, qos, data, metadata); > + pac = bap_pac_new(bdb, name, type, &codec, qos, data, metadata, > + location); > > switch (type) { > case BT_BAP_SINK: > @@ -2716,7 +2745,7 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, > */ > pac_broadcast_sink = bap_pac_new(bdb, name, > BT_BAP_BCAST_SINK, &codec, qos, > - data, metadata); > + data, metadata, 0); > bap_add_broadcast_sink(pac_broadcast_sink); > } > break; > @@ -2737,10 +2766,11 @@ struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name, > uint8_t type, uint8_t id, > struct bt_bap_pac_qos *qos, > struct iovec *data, > - struct iovec *metadata) > + struct iovec *metadata, > + uint32_t location) > { > return bt_bap_add_vendor_pac(db, name, type, id, 0x0000, 0x0000, qos, > - data, metadata); > + data, metadata, location); > } > > uint8_t bt_bap_pac_get_type(struct bt_bap_pac *pac) > @@ -3256,7 +3286,7 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type, > } > > pac = bap_pac_new(bap->rdb, NULL, type, &p->codec, NULL, &data, > - &metadata); > + &metadata, 0); > if (!pac) > continue; > > @@ -5481,7 +5511,7 @@ bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name) > return true; > > pac_broadcast_source = bap_pac_new(bap->rdb, name, BT_BAP_BCAST_SOURCE, > - NULL, NULL, NULL, NULL); > + NULL, NULL, NULL, NULL, 0); > queue_push_tail(bap->rdb->broadcast_sources, pac_broadcast_source); > > if (!pac_broadcast_source) > diff --git a/src/shared/bap.h b/src/shared/bap.h > index ebe4dbf7d858..10e82f35e547 100644 > --- a/src/shared/bap.h > +++ b/src/shared/bap.h > @@ -141,13 +141,15 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, > uint8_t id, uint16_t cid, uint16_t vid, > struct bt_bap_pac_qos *qos, > struct iovec *data, > - struct iovec *metadata); > + struct iovec *metadata, > + uint32_t location); > > struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name, > uint8_t type, uint8_t id, > struct bt_bap_pac_qos *qos, > struct iovec *data, > - struct iovec *metadata); > + struct iovec *metadata, > + uint32_t location); If you change the API you will need to fix their users as well otherwise it won't build and CI will fail. > struct bt_bap_pac_ops { > int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, > -- > 2.34.1
Hi Luiz, > > struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name, > > uint8_t type, uint8_t id, > > struct bt_bap_pac_qos *qos, > > struct iovec *data, > > - struct iovec *metadata); > > + struct iovec *metadata, > > + uint32_t location); > > If you change the API you will need to fix their users as well otherwise it > won't build and CI will fail. Agree. I also found later that location field is already part of qos structure. I would re-work to use the same instead of changing API and submit v2 patchset. > > > struct bt_bap_pac_ops { > > int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac > > *rpac, > > -- > > 2.34.1 > > > > -- > Luiz Augusto von Dentz Thanks, Kiran
diff --git a/profiles/audio/media.c b/profiles/audio/media.c index 1d98ac5a1a70..51e3ab65d12d 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -99,6 +99,7 @@ struct media_endpoint { size_t size; /* Endpoint capabilities size */ uint8_t *metadata; /* Endpoint property metadata */ size_t metadata_size; /* Endpoint metadata size */ + uint32_t location; /* Endpoint location */ guint hs_watch; guint ag_watch; guint watch; @@ -1445,6 +1446,7 @@ media_endpoint_create(struct media_adapter *adapter, int size, uint8_t *metadata, int metadata_size, + uint32_t location, int *err) { struct media_endpoint *endpoint; @@ -1460,6 +1462,7 @@ media_endpoint_create(struct media_adapter *adapter, endpoint->cid = cid; endpoint->vid = vid; endpoint->delay_reporting = delay_reporting; + endpoint->location = location; if (qos) endpoint->qos = *qos; @@ -1525,7 +1528,8 @@ static int parse_properties(DBusMessageIter *props, const char **uuid, uint16_t *cid, uint16_t *vid, struct bt_bap_pac_qos *qos, uint8_t **capabilities, int *size, - uint8_t **metadata, int *metadata_size) + uint8_t **metadata, int *metadata_size, + uint32_t *location) { gboolean has_uuid = FALSE; gboolean has_codec = FALSE; @@ -1609,6 +1613,10 @@ static int parse_properties(DBusMessageIter *props, const char **uuid, if (var != DBUS_TYPE_UINT16) return -EINVAL; dbus_message_iter_get_basic(&value, &qos->ppd_max); + } else if (strcasecmp(key, "Location") == 0) { + if (var != DBUS_TYPE_UINT32) + return -EINVAL; + dbus_message_iter_get_basic(&value, location); } dbus_message_iter_next(props); @@ -1633,6 +1641,7 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg, int size = 0; int metadata_size = 0; int err; + uint32_t location; sender = dbus_message_get_sender(msg); @@ -1650,12 +1659,12 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg, if (parse_properties(&props, &uuid, &delay_reporting, &codec, &cid, &vid, &qos, &capabilities, &size, &metadata, - &metadata_size) < 0) + &metadata_size, &location) < 0) return btd_error_invalid_args(msg); if (media_endpoint_create(adapter, sender, path, uuid, delay_reporting, codec, cid, vid, &qos, capabilities, - size, metadata, metadata_size, + size, metadata, metadata_size, location, &err) == NULL) { if (err == -EPROTONOSUPPORT) return btd_error_not_supported(msg); @@ -2688,6 +2697,7 @@ static void app_register_endpoint(void *data, void *user_data) int size = 0; uint8_t *metadata = NULL; int metadata_size = 0; + uint32_t location; DBusMessageIter iter, array; struct media_endpoint *endpoint; @@ -2748,6 +2758,13 @@ static void app_register_endpoint(void *data, void *user_data) &metadata_size); } + if (g_dbus_proxy_get_property(proxy, "Location", &iter)) { + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) + goto fail; + + dbus_message_iter_get_basic(&iter, &location); + } + /* Parse QoS preferences */ memset(&qos, 0, sizeof(qos)); if (g_dbus_proxy_get_property(proxy, "Framing", &iter)) { @@ -2804,7 +2821,7 @@ static void app_register_endpoint(void *data, void *user_data) vendor.cid, vendor.vid, &qos, capabilities, size, metadata, metadata_size, - &app->err); + location, &app->err); if (!endpoint) { error("Unable to register endpoint %s:%s: %s", app->sender, path, strerror(-app->err));