From: Abhay Maheta <[email protected]>
This adds support for Metadata in BAP profile.
In order to register zero Metadata, 0 shall be
entered when prompted.
[bluetooth]# endpoint.register 00002bc9-0000-1000-8000-00805f9b34fb 0x06
[/local/endpoint/ep0] Enter Metadata (value/no): n
[/local/endpoint/ep0] Auto Accept (yes/no): y
[/local/endpoint/ep0] CIG (auto/value): a
[/local/endpoint/ep0] CIS (auto/value): a
Capabilities:
03 01 ff 00 02 02 03 02 03 03 05 04 1e 00 f0 00 ................
Endpoint /local/endpoint/ep0 registered
---
client/player.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 85 insertions(+), 2 deletions(-)
diff --git a/client/player.c b/client/player.c
index 5572cc566e79..cc35721d85b7 100644
--- a/client/player.c
+++ b/client/player.c
@@ -70,6 +70,7 @@ struct endpoint {
uint16_t cid;
uint16_t vid;
struct iovec *caps;
+ struct iovec *meta;
bool auto_accept;
bool acquiring;
uint8_t cig;
@@ -1582,6 +1583,7 @@ struct endpoint_config {
GDBusProxy *proxy;
struct endpoint *ep;
struct iovec *caps;
+ struct iovec *meta;
uint8_t target_latency;
const struct codec_qos *qos;
};
@@ -1592,6 +1594,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);
@@ -1602,6 +1605,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;
@@ -1699,6 +1711,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->target_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;
@@ -1847,6 +1862,12 @@ static void endpoint_free(void *data)
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);
@@ -1917,10 +1938,38 @@ static gboolean endpoint_vendor_exists(const GDBusPropertyTable *property,
return ep->cid && ep->vid;
}
+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_metadata_exists(const GDBusPropertyTable *property,
+ void *data)
+{
+ struct endpoint *ep = data;
+
+ return ep->meta ? TRUE : FALSE;
+}
+
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,
+ endpoint_metadata_exists },
{ "Vendor", "u", endpoint_get_vendor, NULL, endpoint_vendor_exists },
{ }
};
@@ -1930,6 +1979,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);
@@ -1955,6 +2005,15 @@ static void register_endpoint_setup(DBusMessageIter *iter, void *user_data)
bt_shell_hexdump(ep->caps->iov_base, ep->caps->iov_len);
}
+ if (ep->meta) {
+ g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &meta,
+ DBUS_TYPE_BYTE, &ep->meta->iov_base,
+ ep->meta->iov_len);
+
+ bt_shell_printf("Metadata:\n");
+ bt_shell_hexdump(ep->meta->iov_base, ep->meta->iov_len);
+ }
+
dbus_message_iter_close_container(iter, &dict);
}
@@ -2072,6 +2131,30 @@ 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 (!strcasecmp(input, "n") || !strcasecmp(input, "no")) {
+ free(ep->meta->iov_base);
+ ep->meta = NULL;
+ goto done;
+ }
+
+ if (!ep->meta)
+ ep->meta = g_new0(struct iovec, 1);
+
+ ep->meta->iov_base = str2bytearray((char *) input, &ep->meta->iov_len);
+ if (!ep->meta->iov_base) {
+ free(ep->meta);
+ ep->meta = NULL;
+ }
+
+done:
+ 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;
@@ -2091,8 +2174,8 @@ static void endpoint_set_capabilities(const char *input, void *user_data)
ep->caps->iov_len = 0x00;
}
- bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):",
- endpoint_auto_accept, ep);
+ bt_shell_prompt_input(ep->path, "Enter Metadata (value/no):",
+ endpoint_set_metadata, ep);
}
static char *uuid_generator(const char *text, int state)
--
2.40.0
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=743958
---Test result---
Test Summary:
CheckPatch PASS 0.64 seconds
GitLint PASS 0.34 seconds
BuildEll PASS 27.13 seconds
BluezMake PASS 871.46 seconds
MakeCheck PASS 11.73 seconds
MakeDistcheck PASS 153.80 seconds
CheckValgrind PASS 250.79 seconds
CheckSmatch PASS 339.61 seconds
bluezmakeextell PASS 101.70 seconds
IncrementalBuild PASS 718.81 seconds
ScanBuild PASS 1045.45 seconds
---
Regards,
Linux Bluetooth