This series of patches adds support for Metadata, Company ID and
Vendor Codec ID during Endpoint Registration for LE Audio.
Abhay Maheta (6):
shared/bap: Fix handling for Company ID and Vendor Codec ID
shared/bap: Add support to set stream metadata
profiles: Add Support for Metadata, CID and VID
media-api: Add CompanyID, VendorCodecID, Metadata
client/player: Add support for Company ID, Vendor ID in BAP Profile
client/player: Add support for Metadata in BAP Profile
client/player.c | 205 ++++++++++++++++++++++++++++++++++---
doc/media-api.txt | 18 ++++
profiles/audio/bap.c | 14 ++-
profiles/audio/media.c | 99 ++++++++++++++++--
profiles/audio/transport.c | 4 +-
src/shared/bap.c | 31 +++++-
src/shared/bap.h | 4 +-
7 files changed, 342 insertions(+), 33 deletions(-)
--
2.25.1
This adds support for Company ID and Vendor Codec ID in BAP profile.
This also adds handling of Vendor Specific Coding format for BAP
Profile.
Now it allows to enter zero codec capabilities.
In order to register zero codec capabilities, 0 shall be
entered when prompted.
[bluetooth]# endpoint.register 00002bc9-0000-1000-8000-00805f9b34fb 0xff
[/local/endpoint/ep2] Enter Capabilities: 0
[/local/endpoint/ep2] Enter Company ID & Vendor ID: 0xaabbccdd
[/local/endpoint/ep2] Auto Accept (yes/no): y
[/local/endpoint/ep2] CIG (auto/value): a
[/local/endpoint/ep2] CIS (auto/value): a
Endpoint /local/endpoint/ep2 registered
---
client/player.c | 131 +++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 114 insertions(+), 17 deletions(-)
diff --git a/client/player.c b/client/player.c
index eba233329..0f3b7dbe8 100644
--- a/client/player.c
+++ b/client/player.c
@@ -66,6 +66,8 @@ struct endpoint {
char *path;
char *uuid;
uint8_t codec;
+ uint16_t cid;
+ uint16_t vid;
struct iovec *caps;
bool auto_accept;
bool acquiring;
@@ -85,6 +87,7 @@ static GList *endpoints = NULL;
static GList *local_endpoints = NULL;
static GList *transports = NULL;
static struct queue *ios = NULL;
+static bool is_cid_available = FALSE;
struct transport {
GDBusProxy *proxy;
@@ -1815,7 +1818,8 @@ static void endpoint_free(void *data)
struct endpoint *ep = data;
if (ep->caps) {
- g_free(ep->caps->iov_base);
+ if (ep->caps->iov_base)
+ g_free(ep->caps->iov_base);
g_free(ep->caps);
}
@@ -1865,10 +1869,32 @@ static gboolean endpoint_get_capabilities(const GDBusPropertyTable *property,
return TRUE;
}
+static gboolean endpoint_get_cid(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct endpoint *ep = data;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &ep->cid);
+
+ return TRUE;
+}
+
+static gboolean endpoint_get_vid(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct endpoint *ep = data;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &ep->vid);
+
+ return TRUE;
+}
+
static const GDBusPropertyTable endpoint_properties[] = {
{ "UUID", "s", endpoint_get_uuid, NULL, NULL },
{ "Codec", "y", endpoint_get_codec, NULL, NULL },
{ "Capabilities", "ay", endpoint_get_capabilities, NULL, NULL },
+ { "CompanyID", "q", endpoint_get_cid, NULL, NULL },
+ { "VendorCodecID", "q", endpoint_get_vid, NULL, NULL },
{ }
};
@@ -1886,12 +1912,20 @@ static void register_endpoint_setup(DBusMessageIter *iter, void *user_data)
g_dbus_dict_append_entry(&dict, "Codec", DBUS_TYPE_BYTE, &ep->codec);
- g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &key,
+ g_dbus_dict_append_entry(&dict, "CompanyID", DBUS_TYPE_UINT16,
+ &ep->cid);
+
+ g_dbus_dict_append_entry(&dict, "VendorCodecID", DBUS_TYPE_UINT16,
+ &ep->vid);
+
+ if (ep->caps->iov_len) {
+ g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &key,
DBUS_TYPE_BYTE, &ep->caps->iov_base,
ep->caps->iov_len);
- bt_shell_printf("Capabilities:\n");
- bt_shell_hexdump(ep->caps->iov_base, ep->caps->iov_len);
+ bt_shell_printf("Capabilities:\n");
+ bt_shell_hexdump(ep->caps->iov_base, ep->caps->iov_len);
+ }
dbus_message_iter_close_container(iter, &dict);
}
@@ -1950,6 +1984,21 @@ fail:
}
+static void get_cid_vid(const char *input, uint32_t *id)
+{
+ char *endptr = NULL;
+ int value;
+
+ value = strtol(input, &endptr, 0);
+
+ if (!endptr || *endptr != '\0' || value > UINT32_MAX) {
+ bt_shell_printf("Invalid argument: %s\n", input);
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ *id = (uint32_t)value;
+}
+
static void endpoint_cis(const char *input, void *user_data)
{
struct endpoint *ep = user_data;
@@ -2010,19 +2059,55 @@ static void endpoint_auto_accept(const char *input, void *user_data)
bt_shell_prompt_input(ep->path, "CIG (auto/value):", endpoint_cig, ep);
}
+static void endpoint_set_id(const char *input, void *user_data)
+{
+ struct endpoint *ep = user_data;
+ uint32_t val;
+
+ get_cid_vid(input, &val);
+ ep->cid = (uint16_t)(val & 0x0000ffff);
+ ep->vid = (uint16_t)((val & 0xffff0000) >> 16);
+
+ bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
+ endpoint_auto_accept, ep);
+}
+
+void endpoint_set_parameters(struct endpoint *ep)
+{
+ if (!(strcasecmp(ep->uuid, PAC_SINK_UUID)) ||
+ !(strcasecmp(ep->uuid, PAC_SOURCE_UUID))) {
+ if ((ep->codec == 0xff) && (is_cid_available == FALSE))
+ bt_shell_prompt_input(ep->path,
+ "Enter Company ID & Vendor ID:",
+ endpoint_set_id, ep);
+ else
+ bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
+ endpoint_auto_accept, ep);
+ } else
+ bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
+ endpoint_auto_accept, ep);
+}
+
static void endpoint_set_capabilities(const char *input, void *user_data)
{
struct endpoint *ep = user_data;
- if (ep->caps)
+ if (ep->caps && ep->caps->iov_base) {
g_free(ep->caps->iov_base);
- else
+ ep->caps = g_new0(struct iovec, 1);
+ } else
ep->caps = g_new0(struct iovec, 1);
ep->caps->iov_base = str2bytearray((char *) input, &ep->caps->iov_len);
- bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
- endpoint_auto_accept, ep);
+ if (ep->caps->iov_len == 0x01 &&
+ (*(uint8_t *)(ep->caps->iov_base)) == 0x00) {
+ g_free(ep->caps->iov_base);
+ ep->caps->iov_base = NULL;
+ ep->caps->iov_len = 0x00;
+ }
+
+ endpoint_set_parameters(ep);
}
static char *uuid_generator(const char *text, int state)
@@ -2073,13 +2158,13 @@ static void cmd_register_endpoint(int argc, char *argv[])
ep = g_new0(struct endpoint, 1);
ep->uuid = g_strdup(argv[1]);
ep->codec = strtol(argv[2], &endptr, 0);
+ ep->cid = 0x0000;
+ ep->vid = 0x0000;
ep->path = g_strdup_printf("%s/ep%u", BLUEZ_MEDIA_ENDPOINT_PATH,
g_list_length(local_endpoints));
local_endpoints = g_list_append(local_endpoints, ep);
- if (argc > 3)
- endpoint_set_capabilities(argv[3], ep);
- else {
+ if (argc == 3) {
const struct capabilities *cap;
cap = find_capabilities(ep->uuid, ep->codec);
@@ -2089,13 +2174,25 @@ static void cmd_register_endpoint(int argc, char *argv[])
/* Copy capabilities */
iov_append(&ep->caps, cap->data.iov_base,
- cap->data.iov_len);
+ cap->data.iov_len);
- bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
- endpoint_auto_accept, ep);
+ endpoint_set_parameters(ep);
} else
- bt_shell_prompt_input(ep->path, "Enter capabilities:",
- endpoint_set_capabilities, ep);
+ bt_shell_prompt_input(ep->path, "Enter Capabilities:",
+ endpoint_set_capabilities, ep);
+ } else if (argc == 4) {
+ endpoint_set_capabilities(argv[3], ep);
+ } else if (argc == 5) {
+ uint32_t val = 0;
+
+ get_cid_vid(argv[4], &val);
+ ep->cid = (uint16_t)(val & 0x0000ffff);
+ ep->vid = (uint16_t)((val & 0xffff0000) >> 16);
+ is_cid_available = TRUE;
+
+ endpoint_set_capabilities(argv[3], ep);
+
+ is_cid_available = FALSE;
}
}
@@ -2638,7 +2735,7 @@ static const struct bt_shell_menu endpoint_menu = {
{ "show", "<endpoint>", cmd_show_endpoint,
"Endpoint information",
endpoint_generator },
- { "register", "<UUID> <codec> [capabilities...]",
+ { "register", "<UUID> <codec> [capabilities...] [Company ID]",
cmd_register_endpoint,
"Register Endpoint",
uuid_generator },
--
2.25.1
This adds new API to set stream metadata.
---
src/shared/bap.c | 30 +++++++++++++++++++++++-------
src/shared/bap.h | 2 ++
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 0cafb75e6..b3c65283e 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -344,8 +344,10 @@ static void pac_foreach(void *data, void *user_data)
p = util_iov_push(iov, sizeof(*p));
p->codec.id = pac->codec.id;
- p->codec.cid = pac->codec.cid;
- p->codec.vid = pac->codec.vid;
+ if (p->codec.id == 0xff) {
+ p->codec.cid = cpu_to_le16(pac->codec.cid);
+ p->codec.vid = cpu_to_le16(pac->codec.vid);
+ }
if (pac->data) {
p->cc_len = pac->data->iov_len;
@@ -2773,7 +2775,7 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type,
struct bt_pac *p;
struct bt_ltv *cc;
struct bt_pac_metadata *meta;
- struct iovec data, metadata;
+ struct iovec data, *metadata = NULL;
p = util_iov_pull_mem(&iov, sizeof(*p));
if (!p) {
@@ -2802,8 +2804,11 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type,
data.iov_len = p->cc_len;
data.iov_base = cc;
- metadata.iov_len = meta->len;
- metadata.iov_base = meta->data;
+ if (meta->len) {
+ metadata = new0(struct iovec, 1);
+ metadata->iov_len = meta->len;
+ metadata->iov_base = meta->data;
+ }
util_iov_pull_mem(&iov, meta->len);
@@ -2813,12 +2818,14 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type,
/* Check if there is already a PAC record for the codec */
pac = bap_pac_find(bap->rdb, type, &p->codec);
if (pac) {
- bap_pac_merge(pac, &data, &metadata);
+ bap_pac_merge(pac, &data, metadata);
+ free(metadata);
continue;
}
pac = bap_pac_new(bap->rdb, NULL, type, &p->codec, NULL, &data,
- &metadata);
+ metadata);
+ free(metadata);
if (!pac)
continue;
@@ -4591,6 +4598,15 @@ struct bt_bap_qos *bt_bap_stream_get_qos(struct bt_bap_stream *stream)
return &stream->qos;
}
+void bt_bap_stream_set_metadata(struct bt_bap_stream *stream,
+ struct iovec *meta)
+{
+ if (!stream)
+ return;
+
+ stream_metadata(stream, meta, NULL);
+}
+
struct iovec *bt_bap_stream_get_metadata(struct bt_bap_stream *stream)
{
if (!stream)
diff --git a/src/shared/bap.h b/src/shared/bap.h
index 47a15636c..bcf830ceb 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -248,6 +248,8 @@ uint8_t bt_bap_stream_get_dir(struct bt_bap_stream *stream);
uint32_t bt_bap_stream_get_location(struct bt_bap_stream *stream);
struct iovec *bt_bap_stream_get_config(struct bt_bap_stream *stream);
struct bt_bap_qos *bt_bap_stream_get_qos(struct bt_bap_stream *stream);
+void bt_bap_stream_set_metadata(struct bt_bap_stream *stream,
+ struct iovec *meta);
struct iovec *bt_bap_stream_get_metadata(struct bt_bap_stream *stream);
struct io *bt_bap_stream_get_io(struct bt_bap_stream *stream);
--
2.25.1
This adds support for Metadata, Company ID and Vendor Codec ID
---
profiles/audio/bap.c | 14 +++++-
profiles/audio/media.c | 99 +++++++++++++++++++++++++++++++++++---
profiles/audio/transport.c | 4 +-
3 files changed, 107 insertions(+), 10 deletions(-)
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index ae944b617..2312eb8df 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -484,6 +484,16 @@ static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg,
bt_bap_stream_set_user_data(ep->stream, ep->path);
ep->msg = dbus_message_ref(msg);
+ if (ep->metadata && ep->metadata->iov_len) {
+ struct iovec *meta;
+
+ meta = new0(struct iovec, 1);
+ meta->iov_base = new0(uint8_t, ep->metadata->iov_len);
+ meta->iov_len = ep->metadata->iov_len;
+ memcpy(meta->iov_base, ep->metadata->iov_base, meta->iov_len);
+ bt_bap_stream_set_metadata(ep->stream, meta);
+ }
+
return NULL;
}
@@ -612,8 +622,10 @@ static void select_cb(struct bt_bap_pac *pac, int err, struct iovec *caps,
ep->caps = util_iov_dup(caps, 1);
- if (metadata && metadata->iov_base && metadata->iov_len)
+ if (metadata && metadata->iov_base && metadata->iov_len) {
ep->metadata = util_iov_dup(metadata, 1);
+ bt_bap_stream_set_metadata(ep->stream, ep->metadata);
+ }
ep->qos = *qos;
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index fbb350889..7f114e0db 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -91,10 +91,14 @@ struct media_endpoint {
char *path; /* Endpoint object path */
char *uuid; /* Endpoint property UUID */
uint8_t codec; /* Endpoint codec */
+ uint16_t cid; /* Endpoint company ID */
+ uint16_t vid; /* Endpoint vendor codec ID */
bool delay_reporting;/* Endpoint delay_reporting */
struct bt_bap_pac_qos qos; /* Endpoint qos */
uint8_t *capabilities; /* Endpoint property capabilities */
size_t size; /* Endpoint capabilities size */
+ uint8_t *metadata; /* Endpoint property metadata */
+ size_t metadata_size; /* Endpoint metadata size */
guint hs_watch;
guint ag_watch;
guint watch;
@@ -1108,6 +1112,7 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type,
struct btd_gatt_database *database;
struct gatt_db *db;
struct iovec data;
+ struct iovec *metadata = NULL;
char *name;
if (!(g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL)) {
@@ -1128,12 +1133,23 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type,
return false;
}
+ if (!bap_print_cc(endpoint->metadata, endpoint->metadata_size,
+ bap_debug, NULL)) {
+ error("Unable to parse endpoint metadata");
+ return false;
+ }
+
db = btd_gatt_database_get_db(database);
data.iov_base = endpoint->capabilities;
data.iov_len = endpoint->size;
/* TODO: Add support for metadata */
+ if (endpoint->metadata_size) {
+ metadata = g_new0(struct iovec, 1);
+ metadata->iov_base = endpoint->metadata;
+ metadata->iov_len = endpoint->metadata_size;
+ }
if (asprintf(&name, "%s:%s", endpoint->sender, endpoint->path) < 0) {
error("Could not allocate name for pac %s:%s",
@@ -1141,8 +1157,9 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type,
return false;
}
- endpoint->pac = bt_bap_add_pac(db, name, type, endpoint->codec,
- &endpoint->qos, &data, NULL);
+ endpoint->pac = bt_bap_add_vendor_pac(db, name, type, endpoint->codec,
+ endpoint->cid, endpoint->vid, &endpoint->qos,
+ &data, metadata);
if (!endpoint->pac) {
error("Unable to create PAC");
return false;
@@ -1282,9 +1299,13 @@ media_endpoint_create(struct media_adapter *adapter,
const char *uuid,
gboolean delay_reporting,
uint8_t codec,
+ uint16_t cid,
+ uint16_t vid,
struct bt_bap_pac_qos *qos,
uint8_t *capabilities,
int size,
+ uint8_t *metadata,
+ int metadata_size,
int *err)
{
struct media_endpoint *endpoint;
@@ -1297,6 +1318,8 @@ media_endpoint_create(struct media_adapter *adapter,
endpoint->path = g_strdup(path);
endpoint->uuid = g_strdup(uuid);
endpoint->codec = codec;
+ endpoint->cid = cid;
+ endpoint->vid = vid;
endpoint->delay_reporting = delay_reporting;
if (qos)
@@ -1308,6 +1331,12 @@ media_endpoint_create(struct media_adapter *adapter,
endpoint->size = size;
}
+ if (metadata_size > 0) {
+ endpoint->metadata = g_new(uint8_t, metadata_size);
+ memcpy(endpoint->metadata, metadata, metadata_size);
+ endpoint->metadata_size = metadata_size;
+ }
+
endpoint->adapter = adapter;
for (i = 0; i < ARRAY_SIZE(init_table); i++) {
@@ -1349,8 +1378,10 @@ media_endpoint_create(struct media_adapter *adapter,
static int parse_properties(DBusMessageIter *props, const char **uuid,
gboolean *delay_reporting, uint8_t *codec,
+ uint16_t *cid, uint16_t *vid,
struct bt_bap_pac_qos *qos,
- uint8_t **capabilities, int *size)
+ uint8_t **capabilities, int *size,
+ uint8_t **metadata, int *metadata_size)
{
gboolean has_uuid = FALSE;
gboolean has_codec = FALSE;
@@ -1377,6 +1408,14 @@ static int parse_properties(DBusMessageIter *props, const char **uuid,
return -EINVAL;
dbus_message_iter_get_basic(&value, codec);
has_codec = TRUE;
+ } else if (strcasecmp(key, "CompanyID") == 0) {
+ if (var != DBUS_TYPE_UINT16)
+ return -EINVAL;
+ dbus_message_iter_get_basic(&value, cid);
+ } else if (strcasecmp(key, "VendorCodecID") == 0) {
+ if (var != DBUS_TYPE_UINT16)
+ return -EINVAL;
+ dbus_message_iter_get_basic(&value, vid);
} else if (strcasecmp(key, "DelayReporting") == 0) {
if (var != DBUS_TYPE_BOOLEAN)
return -EINVAL;
@@ -1390,6 +1429,15 @@ static int parse_properties(DBusMessageIter *props, const char **uuid,
dbus_message_iter_recurse(&value, &array);
dbus_message_iter_get_fixed_array(&array, capabilities,
size);
+ } else if (strcasecmp(key, "Metadata") == 0) {
+ DBusMessageIter array;
+
+ if (var != DBUS_TYPE_ARRAY)
+ return -EINVAL;
+
+ dbus_message_iter_recurse(&value, &array);
+ dbus_message_iter_get_fixed_array(&array, metadata,
+ metadata_size);
} else if (strcasecmp(key, "Framing") == 0) {
if (var != DBUS_TYPE_BYTE)
return -EINVAL;
@@ -1434,9 +1482,13 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg,
const char *sender, *path, *uuid;
gboolean delay_reporting = FALSE;
uint8_t codec = 0;
+ uint16_t cid = 0;
+ uint16_t vid = 0;
struct bt_bap_pac_qos qos = {};
uint8_t *capabilities = NULL;
+ uint8_t *metadata = NULL;
int size = 0;
+ int metadata_size = 0;
int err;
sender = dbus_message_get_sender(msg);
@@ -1453,12 +1505,14 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg,
if (dbus_message_iter_get_arg_type(&props) != DBUS_TYPE_DICT_ENTRY)
return btd_error_invalid_args(msg);
- if (parse_properties(&props, &uuid, &delay_reporting, &codec, &qos,
- &capabilities, &size) < 0)
+ if (parse_properties(&props, &uuid, &delay_reporting, &codec, &cid,
+ &vid, &qos, &capabilities, &size, &metadata,
+ &metadata_size) < 0)
return btd_error_invalid_args(msg);
if (media_endpoint_create(adapter, sender, path, uuid, delay_reporting,
- codec, &qos, capabilities, size,
+ codec, cid, vid, &qos, capabilities,
+ size, metadata, metadata_size,
&err) == NULL) {
if (err == -EPROTONOSUPPORT)
return btd_error_not_supported(msg);
@@ -2485,9 +2539,13 @@ static void app_register_endpoint(void *data, void *user_data)
const char *uuid;
gboolean delay_reporting = FALSE;
uint8_t codec;
+ uint16_t cid = 0;
+ uint16_t vid = 0;
struct bt_bap_pac_qos qos;
uint8_t *capabilities = NULL;
int size = 0;
+ uint8_t *metadata = NULL;
+ int metadata_size = 0;
DBusMessageIter iter, array;
struct media_endpoint *endpoint;
@@ -2514,6 +2572,20 @@ static void app_register_endpoint(void *data, void *user_data)
dbus_message_iter_get_basic(&iter, &codec);
+ if (g_dbus_proxy_get_property(proxy, "CompanyID", &iter)) {
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT16)
+ goto fail;
+
+ dbus_message_iter_get_basic(&iter, &cid);
+ }
+
+ if (g_dbus_proxy_get_property(proxy, "VendorCodecID", &iter)) {
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT16)
+ goto fail;
+
+ dbus_message_iter_get_basic(&iter, &vid);
+ }
+
/* DelayReporting and Capabilities are considered optional */
if (g_dbus_proxy_get_property(proxy, "DelayReporting", &iter)) {
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN)
@@ -2530,6 +2602,15 @@ static void app_register_endpoint(void *data, void *user_data)
dbus_message_iter_get_fixed_array(&array, &capabilities, &size);
}
+ if (g_dbus_proxy_get_property(proxy, "Metadata", &iter)) {
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
+ goto fail;
+
+ dbus_message_iter_recurse(&iter, &array);
+ dbus_message_iter_get_fixed_array(&array, &metadata,
+ &metadata_size);
+ }
+
/* Parse QoS preferences */
memset(&qos, 0, sizeof(qos));
if (g_dbus_proxy_get_property(proxy, "Framing", &iter)) {
@@ -2582,8 +2663,10 @@ static void app_register_endpoint(void *data, void *user_data)
}
endpoint = media_endpoint_create(app->adapter, app->sender, path, uuid,
- delay_reporting, codec, &qos,
- capabilities, size, &app->err);
+ delay_reporting, codec, cid,
+ vid, &qos, capabilities,
+ size, metadata, metadata_size,
+ &app->err);
if (!endpoint) {
error("Unable to register endpoint %s:%s: %s", app->sender,
path, strerror(-app->err));
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 41339da51..5e057e2a5 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -1185,6 +1185,7 @@ static guint resume_bap(struct media_transport *transport,
struct media_owner *owner)
{
struct bap_transport *bap = transport->data;
+ struct iovec *meta;
guint id;
if (!bap->stream)
@@ -1202,7 +1203,8 @@ static guint resume_bap(struct media_transport *transport,
return g_idle_add(resume_complete, transport);
}
- id = bt_bap_stream_enable(bap->stream, bap->linked, NULL,
+ meta = bt_bap_stream_get_metadata(bap->stream);
+ id = bt_bap_stream_enable(bap->stream, bap->linked, meta,
bap_enable_complete, owner);
if (!id)
return 0;
--
2.25.1
Dear Abhay,
Thank you for your patches.
Am 29.12.22 um 13:28 schrieb Abhay Maheta:
[…]
Just a note, that your system time is configured incorrectly and set to
the future.
Received: from tester-latitude-7480.iind.intel.com ([10.224.186.122])
by orsmga004.jf.intel.com with ESMTP; 29 Dec 2022 04:09:48 -0800
[…]
Date: Thu, 29 Dec 2022 17:58:17 +0530
It’d be great, if you fixed that, as it messes up the ordering in the inbox.
Kind regards,
Paul
Hi Paul,
Thank you for your feedback.
I have updated time and reuploaded the patches.
Thanks & Regards,
Abhay
-----Original Message-----
From: Paul Menzel <[email protected]>
Sent: 29 December 2022 17:52
To: Maheta, Abhay <[email protected]>
Cc: Abhay Maheta <[email protected]>; [email protected]
Subject: Re: [PATCH BlueZ v2 0/6] To add support for Metadata, CID, VID
Dear Abhay,
Thank you for your patches.
Am 29.12.22 um 13:28 schrieb Abhay Maheta:
[…]
Just a note, that your system time is configured incorrectly and set to the future.
Received: from tester-latitude-7480.iind.intel.com ([10.224.186.122])
by orsmga004.jf.intel.com with ESMTP; 29 Dec 2022 04:09:48 -0800
[…]
Date: Thu, 29 Dec 2022 17:58:17 +0530
It’d be great, if you fixed that, as it messes up the ordering in the inbox.
Kind regards,
Paul