This series of patches adds support for Metadata, Company ID and
Vendor Codec ID during Endpoint Registration for LE Audio.
Abhay Maheta (1):
shared/bap: Fix handling for Company ID and Vendor Codec ID
Maheta, Abhay (4):
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 Metadata, CID, VID
client/player.c | 185 +++++++++++++++++++++++++++++++++++--
doc/media-api.txt | 18 ++++
profiles/audio/bap.c | 20 ++++
profiles/audio/media.c | 100 ++++++++++++++++++--
profiles/audio/transport.c | 4 +-
src/shared/bap.c | 25 ++++-
src/shared/bap.h | 4 +-
7 files changed, 331 insertions(+), 25 deletions(-)
--
2.25.1
This adds fixes for handing for Company ID and Vendor Codec ID
while adding PAC record to database and responding to Attribute
Read Request for Sink/Source PAC Characteristics.
---
src/shared/bap.c | 5 +++++
src/shared/bap.h | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index c3c0d596f..0ae0eba33 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -416,6 +416,8 @@ static void pac_foreach(void *data, void *user_data)
p = iov_add(iov, sizeof(*p));
p->codec.id = pac->codec.id;
+ p->codec.cid = pac->codec.cid;
+ p->codec.vid = pac->codec.vid;
if (pac->data) {
p->cc_len = pac->data->iov_len;
@@ -2415,6 +2417,9 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
if (!bdb)
return NULL;
+ if ((id != 0xff) && ((cid != 0U) || (vid != 0U)))
+ return NULL;
+
codec.id = id;
codec.cid = cid;
codec.vid = vid;
diff --git a/src/shared/bap.h b/src/shared/bap.h
index 7b9f88c83..923669f32 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -39,8 +39,8 @@ struct bt_bap_stream;
struct bt_bap_codec {
uint8_t id;
- uint16_t vid;
uint16_t cid;
+ uint16_t vid;
} __packed;
struct bt_ltv {
--
2.25.1
From: "Maheta, Abhay" <[email protected]>
This adds support for Metadata, Company ID and Vendor Codec ID
---
profiles/audio/bap.c | 20 ++++++++
profiles/audio/media.c | 100 +++++++++++++++++++++++++++++++++----
profiles/audio/transport.c | 4 +-
3 files changed, 114 insertions(+), 10 deletions(-)
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index 67aba3bd7..401af796c 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -481,6 +481,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;
}
@@ -597,6 +607,16 @@ static void select_cb(struct bt_bap_pac *pac, int err, struct iovec *caps,
}
bt_bap_stream_set_user_data(ep->stream, ep->path);
+
+ if (metadata && metadata->iov_len) {
+ struct iovec *meta;
+
+ meta = new0(struct iovec, 1);
+ meta->iov_base = new0(uint8_t, metadata->iov_len);
+ meta->iov_len = metadata->iov_len;
+ memcpy(meta->iov_base, metadata->iov_base, meta->iov_len);
+ bt_bap_stream_set_metadata(ep->stream, meta);
+ }
}
static bool pac_found(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac,
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index c9328ab9b..62f91bea3 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;
@@ -1113,6 +1117,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)) {
@@ -1133,12 +1138,22 @@ 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",
@@ -1146,8 +1161,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;
@@ -1287,9 +1303,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;
@@ -1302,6 +1322,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)
@@ -1313,6 +1335,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++) {
@@ -1354,8 +1382,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;
@@ -1382,6 +1412,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;
@@ -1395,6 +1433,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;
@@ -1439,9 +1486,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);
@@ -1458,12 +1509,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);
@@ -2490,9 +2543,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;
@@ -2519,6 +2576,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)
@@ -2535,6 +2606,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)) {
@@ -2587,8 +2667,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
From: "Maheta, Abhay" <[email protected]>
This adds CompanyID, VendorCodecID, Metadata for RegisterEndpoint method
---
doc/media-api.txt | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/doc/media-api.txt b/doc/media-api.txt
index 847f8bee7..ce2b74e53 100644
--- a/doc/media-api.txt
+++ b/doc/media-api.txt
@@ -34,11 +34,29 @@ Methods void RegisterEndpoint(object endpoint, dict properties)
match the profile specification which
is indicated by the UUID.
+ uint16_t CompanyID:
+
+ Assigned number of Company ID that the
+ endpoint implements. It should be set to
+ appropriate value when Vendor Specific
+ Codec is used.
+
+ uint16_t VendorCodecID:
+
+ Vendor-specific codec ID that the endpoint
+ implements. It should be set to appropriate
+ value when Vendor Specific Codec is used.
+
array{byte} Capabilities:
Capabilities blob, it is used as it is
so the size and byte order must match.
+ array{byte} Metadata:
+
+ Metadata blob, it is used as it is
+ so the size and byte order must match.
+
Possible Errors: org.bluez.Error.InvalidArguments
org.bluez.Error.NotSupported - emitted
when interface for the end-point is
--
2.25.1
From: "Maheta, Abhay" <[email protected]>
This adds new API to set stream metadata.
---
src/shared/bap.c | 20 ++++++++++++++++----
src/shared/bap.h | 2 ++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 0ae0eba33..cc89d65a3 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -2787,7 +2787,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 = iov_pull_mem(&iov, sizeof(*p));
if (!p) {
@@ -2816,13 +2816,16 @@ 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;
+ }
iov_pull_mem(&iov, meta->len);
pac = bap_pac_new(bap->rdb, NULL, type, &p->codec, NULL, &data,
- &metadata);
+ metadata);
if (!pac)
continue;
@@ -4567,6 +4570,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->meta = meta;
+}
+
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 923669f32..0c83726da 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -249,6 +249,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
From: "Maheta, Abhay" <[email protected]>
This adds support for Metadata, Company ID and Vendor Codec ID.
This also adds handling of Vendor Specific Coding format.
Now it allows to enter zero codec capabilities.
It allows to enter zero metadata as well.
In order to register zero codec capabilities and metadata
0 shall be entered when prompted.
---
client/player.c | 185 +++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 175 insertions(+), 10 deletions(-)
diff --git a/client/player.c b/client/player.c
index 432408934..f4338416b 100644
--- a/client/player.c
+++ b/client/player.c
@@ -63,7 +63,10 @@ struct endpoint {
char *path;
char *uuid;
uint8_t codec;
+ uint16_t cid;
+ uint16_t vid;
struct iovec *caps;
+ struct iovec *meta;
bool auto_accept;
bool acquiring;
uint8_t cig;
@@ -1643,6 +1646,7 @@ struct endpoint_config {
GDBusProxy *proxy;
struct endpoint *ep;
struct iovec *caps;
+ struct iovec *meta;
uint8_t target_latency;
const struct codec_qos *qos;
};
@@ -1653,6 +1657,7 @@ static void append_properties(DBusMessageIter *iter,
DBusMessageIter dict;
struct codec_qos *qos = (void *)cfg->qos;
const char *key = "Capabilities";
+ const char *meta = "Metadata";
dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "{sv}", &dict);
@@ -1663,6 +1668,15 @@ static void append_properties(DBusMessageIter *iter,
DBUS_TYPE_BYTE, &cfg->caps->iov_base,
cfg->caps->iov_len);
+ if (cfg->meta->iov_len) {
+ g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &meta,
+ DBUS_TYPE_BYTE, &cfg->meta->iov_base,
+ cfg->meta->iov_len);
+
+ bt_shell_printf("Metadata:\n");
+ bt_shell_hexdump(cfg->meta->iov_base, cfg->meta->iov_len);
+ }
+
if (!qos)
goto done;
@@ -1756,6 +1770,9 @@ static DBusMessage *endpoint_select_properties_reply(struct endpoint *ep,
iov_append(&cfg->caps, preset->data.iov_base, preset->data.iov_len);
cfg->target_latency = preset->latency;
+ /* Copy metadata */
+ iov_append(&cfg->meta, cfg->ep->meta->iov_base, cfg->ep->meta->iov_len);
+
if (preset->qos.phy)
/* Set QoS parameters */
cfg->qos = &preset->qos;
@@ -1899,10 +1916,17 @@ 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);
}
+ if (ep->meta) {
+ if (ep->meta->iov_base)
+ g_free(ep->meta->iov_base);
+ g_free(ep->meta);
+ }
+
if (ep->msg)
dbus_message_unref(ep->msg);
@@ -1949,10 +1973,52 @@ static gboolean endpoint_get_capabilities(const GDBusPropertyTable *property,
return TRUE;
}
+static gboolean endpoint_get_metadata(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct endpoint *ep = data;
+ DBusMessageIter array;
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_BYTE_AS_STRING, &array);
+
+ dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE,
+ &ep->meta->iov_base,
+ ep->meta->iov_len);
+
+ dbus_message_iter_close_container(iter, &array);
+
+ 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 },
+ { "Metadata", "ay", endpoint_get_metadata, NULL, NULL },
+ { "CompanyID", "q", endpoint_get_cid, NULL, NULL },
+ { "VendorCodecID", "q", endpoint_get_vid, NULL, NULL },
{ }
};
@@ -1961,6 +2027,7 @@ static void register_endpoint_setup(DBusMessageIter *iter, void *user_data)
struct endpoint *ep = user_data;
DBusMessageIter dict;
const char *key = "Capabilities";
+ const char *meta = "Metadata";
dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &ep->path);
@@ -1970,12 +2037,29 @@ 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);
+ }
+
+ if (ep->meta->iov_len) {
+ bt_shell_printf("Metadata:\n");
+ bt_shell_hexdump(ep->meta->iov_base, ep->meta->iov_len);
+
+ g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &meta,
+ DBUS_TYPE_BYTE, &ep->meta->iov_base,
+ ep->meta->iov_len);
+ }
dbus_message_iter_close_container(iter, &dict);
}
@@ -2094,19 +2178,93 @@ 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_metadata(const char *input, void *user_data)
+{
+ struct endpoint *ep = user_data;
+
+ if (ep->meta && ep->meta->iov_base) {
+ g_free(ep->meta->iov_base);
+ ep->meta->iov_base = NULL;
+ } else
+ ep->meta = g_new0(struct iovec, 1);
+
+ ep->meta->iov_base = str2bytearray((char *) input, &ep->meta->iov_len);
+
+ if (ep->meta->iov_len == 0x01 && (*(uint8_t *)(ep->meta->iov_base)) ==
+ 0x00) {
+ g_free(ep->meta->iov_base);
+ ep->meta->iov_base = NULL;
+ ep->meta->iov_len = 0x00;
+ }
+
+ bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
+ endpoint_auto_accept, ep);
+}
+
+static void endpoint_set_vid(const char *input, void *user_data)
+{
+ struct endpoint *ep = user_data;
+ char *endptr = NULL;
+ int value;
+
+ value = strtol(input, &endptr, 0);
+
+ if (!endptr || *endptr != '\0' || value > UINT16_MAX) {
+ bt_shell_printf("Invalid argument: %s\n", input);
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ ep->vid = value;
+
+ bt_shell_prompt_input(ep->path, "Enter Metadata:",
+ endpoint_set_metadata, ep);
+}
+
+static void endpoint_set_cid(const char *input, void *user_data)
+{
+ struct endpoint *ep = user_data;
+ char *endptr = NULL;
+ int value;
+
+ value = strtol(input, &endptr, 0);
+
+ if (!endptr || *endptr != '\0' || value > UINT16_MAX) {
+ bt_shell_printf("Invalid argument: %s\n", input);
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ ep->cid = value;
+
+ bt_shell_prompt_input(ep->path, "Vendor Codec ID:",
+ endpoint_set_vid, 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->iov_base = NULL;
+ } 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;
+ }
+
+ if (ep->codec == 0xff) {
+ bt_shell_prompt_input(ep->path, "Enter Company ID:",
+ endpoint_set_cid, ep);
+ } else {
+ bt_shell_prompt_input(ep->path, "Enter Metadata:",
+ endpoint_set_metadata, ep);
+ }
}
static char *uuid_generator(const char *text, int state)
@@ -2175,8 +2333,15 @@ static void cmd_register_endpoint(int argc, char *argv[])
iov_append(&ep->caps, cap->data.iov_base,
cap->data.iov_len);
- bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
- endpoint_auto_accept, ep);
+ if (ep->codec == 0xff) {
+ bt_shell_prompt_input(ep->path,
+ "Enter Company ID:",
+ endpoint_set_cid, ep);
+ } else {
+ bt_shell_prompt_input(ep->path,
+ "Enter Metadata:",
+ endpoint_set_metadata, ep);
+ }
} else
bt_shell_prompt_input(ep->path, "Enter capabilities:",
endpoint_set_capabilities, ep);
--
2.25.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=690159
---Test result---
Test Summary:
CheckPatch PASS 5.60 seconds
GitLint PASS 3.64 seconds
Prep - Setup ELL PASS 26.71 seconds
Build - Prep PASS 0.68 seconds
Build - Configure PASS 8.32 seconds
Build - Make PASS 749.65 seconds
Make Check PASS 11.86 seconds
Make Check w/Valgrind PASS 292.31 seconds
Make Distcheck PASS 240.14 seconds
Build w/ext ELL - Configure PASS 8.38 seconds
Build w/ext ELL - Make PASS 85.77 seconds
Incremental Build w/ patches PASS 503.62 seconds
Scan Build WARNING 547.38 seconds
Details
##############################
Test: Scan Build - WARNING
Desc: Run Scan Build with patches
Output:
*****************************************************************************
The bugs reported by the scan-build may or may not be caused by your patches.
Please check the list and fix the bugs if they are caused by your patch.
*****************************************************************************
client/player.c:1770:25: warning: Dereference of null pointer
iov_append(&cfg->caps, preset->data.iov_base, preset->data.iov_len);
^~~~~~~~~~~~~~~~~~~~~
1 warning generated.
profiles/audio/media.c:1159:3: warning: Potential leak of memory pointed to by 'metadata'
error("Could not allocate name for pac %s:%s",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./src/log.h:62:2: note: expanded from macro 'error'
btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
^~~~~~~~~
1 warning generated.
---
Regards,
Linux Bluetooth
Hi Abhay,
On Sat, Oct 29, 2022 at 9:53 AM Abhay Maheta
<[email protected]> wrote:
>
> This adds fixes for handing for Company ID and Vendor Codec ID
> while adding PAC record to database and responding to Attribute
> Read Request for Sink/Source PAC Characteristics.
> ---
> src/shared/bap.c | 5 +++++
> src/shared/bap.h | 2 +-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/shared/bap.c b/src/shared/bap.c
> index c3c0d596f..0ae0eba33 100644
> --- a/src/shared/bap.c
> +++ b/src/shared/bap.c
> @@ -416,6 +416,8 @@ static void pac_foreach(void *data, void *user_data)
>
> p = iov_add(iov, sizeof(*p));
> p->codec.id = pac->codec.id;
Lets check if the codec.id is 0xff before attempting to assign these
values, btw since they are le16 we need to use cpu_to_le16 when
assigning.
> + p->codec.cid = pac->codec.cid;
> + p->codec.vid = pac->codec.vid;
>
> if (pac->data) {
> p->cc_len = pac->data->iov_len;
> @@ -2415,6 +2417,9 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
> if (!bdb)
> return NULL;
>
> + if ((id != 0xff) && ((cid != 0U) || (vid != 0U)))
> + return NULL;
> +
> codec.id = id;
> codec.cid = cid;
> codec.vid = vid;
> diff --git a/src/shared/bap.h b/src/shared/bap.h
> index 7b9f88c83..923669f32 100644
> --- a/src/shared/bap.h
> +++ b/src/shared/bap.h
> @@ -39,8 +39,8 @@ struct bt_bap_stream;
>
> struct bt_bap_codec {
> uint8_t id;
> - uint16_t vid;
> uint16_t cid;
> + uint16_t vid;
> } __packed;
>
> struct bt_ltv {
> --
> 2.25.1
>
--
Luiz Augusto von Dentz
Hi Abhay,
On Sat, Oct 29, 2022 at 9:54 AM Abhay Maheta
<[email protected]> wrote:
>
> From: "Maheta, Abhay" <[email protected]>
>
> This adds CompanyID, VendorCodecID, Metadata for RegisterEndpoint method
> ---
> doc/media-api.txt | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/doc/media-api.txt b/doc/media-api.txt
> index 847f8bee7..ce2b74e53 100644
> --- a/doc/media-api.txt
> +++ b/doc/media-api.txt
> @@ -34,11 +34,29 @@ Methods void RegisterEndpoint(object endpoint, dict properties)
> match the profile specification which
> is indicated by the UUID.
>
> + uint16_t CompanyID:
> +
> + Assigned number of Company ID that the
> + endpoint implements. It should be set to
> + appropriate value when Vendor Specific
> + Codec is used.
> +
> + uint16_t VendorCodecID:
> +
> + Vendor-specific codec ID that the endpoint
> + implements. It should be set to appropriate
> + value when Vendor Specific Codec is used.
I think we can be a less confusing with respect to CodecID, so instead
of using the special 0xff to determine the endpoint is registering a
vendor codec we can use the CompanyID directly, so if it is present
(D-Bus property exists) then codec ID is used a vid and the codec id
is set to 0x0ff.
We also need to document if CompanyID is BAP only or not, afaik for
A2DP we do have this information prepended into the Capabilities, but
I think adding the CompanyID is better so I wouldn't oppose adding
support for it also in A2DP.
> array{byte} Capabilities:
>
> Capabilities blob, it is used as it is
> so the size and byte order must match.
>
> + array{byte} Metadata:
> +
> + Metadata blob, it is used as it is
> + so the size and byte order must match.
> +
> Possible Errors: org.bluez.Error.InvalidArguments
> org.bluez.Error.NotSupported - emitted
> when interface for the end-point is
> --
> 2.25.1
>
--
Luiz Augusto von Dentz
Hi Abhay,
On Sat, Oct 29, 2022 at 9:54 AM Abhay Maheta
<[email protected]> wrote:
>
> From: "Maheta, Abhay" <[email protected]>
>
> This adds new API to set stream metadata.
> ---
> src/shared/bap.c | 20 ++++++++++++++++----
> src/shared/bap.h | 2 ++
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/src/shared/bap.c b/src/shared/bap.c
> index 0ae0eba33..cc89d65a3 100644
> --- a/src/shared/bap.c
> +++ b/src/shared/bap.c
> @@ -2787,7 +2787,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 = iov_pull_mem(&iov, sizeof(*p));
> if (!p) {
> @@ -2816,13 +2816,16 @@ 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;
> + }
Not quite sure why we need to allocate memory on the heap here?
bap_pac_new does iov_dup so it would end up having the same result,
besides I think metadata is liked now since I don't see any free.
> iov_pull_mem(&iov, meta->len);
>
> pac = bap_pac_new(bap->rdb, NULL, type, &p->codec, NULL, &data,
> - &metadata);
> + metadata);
> if (!pac)
> continue;
>
> @@ -4567,6 +4570,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->meta = meta;
Were we probably need to use iov_dup as well, in fact we do have
stream_metada that should handle this properly so perhaps you want to
update bt_bap_stream_metadata and check if the has _not_ been enabled
yet just call stream_medata with rsp=NULL so this would store the
contents of meta into stream->meta locally instead of attempt to use
BT_ASCS_METADATA to update it in the server.
> +}
> +
> 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 923669f32..0c83726da 100644
> --- a/src/shared/bap.h
> +++ b/src/shared/bap.h
> @@ -249,6 +249,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
>
--
Luiz Augusto von Dentz
Hi Abhay,
On Sat, Oct 29, 2022 at 10:21 AM Abhay Maheta
<[email protected]> wrote:
>
> From: "Maheta, Abhay" <[email protected]>
>
> This adds support for Metadata, Company ID and Vendor Codec ID.
> This also adds handling of Vendor Specific Coding format.
> Now it allows to enter zero codec capabilities.
> It allows to enter zero metadata as well.
> In order to register zero codec capabilities and metadata
> 0 shall be entered when prompted.
It's probably easier to understand if you split the handling of
metadata and vendor codec in different commits and add a sample output
to show how it looks in practice.
> ---
> client/player.c | 185 +++++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 175 insertions(+), 10 deletions(-)
>
> diff --git a/client/player.c b/client/player.c
> index 432408934..f4338416b 100644
> --- a/client/player.c
> +++ b/client/player.c
> @@ -63,7 +63,10 @@ struct endpoint {
> char *path;
> char *uuid;
> uint8_t codec;
> + uint16_t cid;
> + uint16_t vid;
> struct iovec *caps;
> + struct iovec *meta;
> bool auto_accept;
> bool acquiring;
> uint8_t cig;
> @@ -1643,6 +1646,7 @@ struct endpoint_config {
> GDBusProxy *proxy;
> struct endpoint *ep;
> struct iovec *caps;
> + struct iovec *meta;
> uint8_t target_latency;
> const struct codec_qos *qos;
> };
> @@ -1653,6 +1657,7 @@ static void append_properties(DBusMessageIter *iter,
> DBusMessageIter dict;
> struct codec_qos *qos = (void *)cfg->qos;
> const char *key = "Capabilities";
> + const char *meta = "Metadata";
>
> dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "{sv}", &dict);
>
> @@ -1663,6 +1668,15 @@ static void append_properties(DBusMessageIter *iter,
> DBUS_TYPE_BYTE, &cfg->caps->iov_base,
> cfg->caps->iov_len);
>
> + if (cfg->meta->iov_len) {
> + g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &meta,
> + DBUS_TYPE_BYTE, &cfg->meta->iov_base,
> + cfg->meta->iov_len);
> +
> + bt_shell_printf("Metadata:\n");
> + bt_shell_hexdump(cfg->meta->iov_base, cfg->meta->iov_len);
> + }
> +
> if (!qos)
> goto done;
>
> @@ -1756,6 +1770,9 @@ static DBusMessage *endpoint_select_properties_reply(struct endpoint *ep,
> iov_append(&cfg->caps, preset->data.iov_base, preset->data.iov_len);
> cfg->target_latency = preset->latency;
>
> + /* Copy metadata */
> + iov_append(&cfg->meta, cfg->ep->meta->iov_base, cfg->ep->meta->iov_len);
> +
> if (preset->qos.phy)
> /* Set QoS parameters */
> cfg->qos = &preset->qos;
> @@ -1899,10 +1916,17 @@ 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);
> }
>
> + if (ep->meta) {
> + if (ep->meta->iov_base)
> + g_free(ep->meta->iov_base);
> + g_free(ep->meta);
> + }
> +
> if (ep->msg)
> dbus_message_unref(ep->msg);
>
> @@ -1949,10 +1973,52 @@ static gboolean endpoint_get_capabilities(const GDBusPropertyTable *property,
> return TRUE;
> }
>
> +static gboolean endpoint_get_metadata(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct endpoint *ep = data;
> + DBusMessageIter array;
> +
> + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
> + DBUS_TYPE_BYTE_AS_STRING, &array);
> +
> + dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE,
> + &ep->meta->iov_base,
> + ep->meta->iov_len);
> +
> + dbus_message_iter_close_container(iter, &array);
> +
> + 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 },
> + { "Metadata", "ay", endpoint_get_metadata, NULL, NULL },
> + { "CompanyID", "q", endpoint_get_cid, NULL, NULL },
> + { "VendorCodecID", "q", endpoint_get_vid, NULL, NULL },
You should probably add a .exists callback so when these values are
not set their property is omitted, if we follow my suggestion to use
the presence of CompanyID (e.g. ep.cid != 0xffff) to determine the use
of Codec as vendor codec id.
> { }
> };
>
> @@ -1961,6 +2027,7 @@ static void register_endpoint_setup(DBusMessageIter *iter, void *user_data)
> struct endpoint *ep = user_data;
> DBusMessageIter dict;
> const char *key = "Capabilities";
> + const char *meta = "Metadata";
>
> dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &ep->path);
>
> @@ -1970,12 +2037,29 @@ 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);
> + }
> +
> + if (ep->meta->iov_len) {
> + bt_shell_printf("Metadata:\n");
> + bt_shell_hexdump(ep->meta->iov_base, ep->meta->iov_len);
> +
> + g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &meta,
> + DBUS_TYPE_BYTE, &ep->meta->iov_base,
> + ep->meta->iov_len);
> + }
>
> dbus_message_iter_close_container(iter, &dict);
> }
> @@ -2094,19 +2178,93 @@ 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_metadata(const char *input, void *user_data)
> +{
> + struct endpoint *ep = user_data;
> +
> + if (ep->meta && ep->meta->iov_base) {
> + g_free(ep->meta->iov_base);
> + ep->meta->iov_base = NULL;
> + } else
> + ep->meta = g_new0(struct iovec, 1);
> +
> + ep->meta->iov_base = str2bytearray((char *) input, &ep->meta->iov_len);
> +
> + if (ep->meta->iov_len == 0x01 && (*(uint8_t *)(ep->meta->iov_base)) ==
> + 0x00) {
> + g_free(ep->meta->iov_base);
> + ep->meta->iov_base = NULL;
> + ep->meta->iov_len = 0x00;
> + }
> +
> + bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
> + endpoint_auto_accept, ep);
> +}
> +
> +static void endpoint_set_vid(const char *input, void *user_data)
> +{
> + struct endpoint *ep = user_data;
> + char *endptr = NULL;
> + int value;
> +
> + value = strtol(input, &endptr, 0);
> +
> + if (!endptr || *endptr != '\0' || value > UINT16_MAX) {
> + bt_shell_printf("Invalid argument: %s\n", input);
> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
> + }
> +
> + ep->vid = value;
> +
> + bt_shell_prompt_input(ep->path, "Enter Metadata:",
> + endpoint_set_metadata, ep);
> +}
> +
> +static void endpoint_set_cid(const char *input, void *user_data)
> +{
> + struct endpoint *ep = user_data;
> + char *endptr = NULL;
> + int value;
> +
> + value = strtol(input, &endptr, 0);
> +
> + if (!endptr || *endptr != '\0' || value > UINT16_MAX) {
> + bt_shell_printf("Invalid argument: %s\n", input);
> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
> + }
> +
> + ep->cid = value;
> +
> + bt_shell_prompt_input(ep->path, "Vendor Codec ID:",
> + endpoint_set_vid, 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->iov_base = NULL;
> + } 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;
> + }
> +
> + if (ep->codec == 0xff) {
> + bt_shell_prompt_input(ep->path, "Enter Company ID:",
> + endpoint_set_cid, ep);
> + } else {
> + bt_shell_prompt_input(ep->path, "Enter Metadata:",
> + endpoint_set_metadata, ep);
> + }
> }
>
> static char *uuid_generator(const char *text, int state)
> @@ -2175,8 +2333,15 @@ static void cmd_register_endpoint(int argc, char *argv[])
> iov_append(&ep->caps, cap->data.iov_base,
> cap->data.iov_len);
>
> - bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
> - endpoint_auto_accept, ep);
> + if (ep->codec == 0xff) {
> + bt_shell_prompt_input(ep->path,
> + "Enter Company ID:",
> + endpoint_set_cid, ep);
> + } else {
> + bt_shell_prompt_input(ep->path,
> + "Enter Metadata:",
> + endpoint_set_metadata, ep);
> + }
> } else
> bt_shell_prompt_input(ep->path, "Enter capabilities:",
> endpoint_set_capabilities, ep);
> --
> 2.25.1
>
--
Luiz Augusto von Dentz