Use the documented name "MaximumLatency" for the MediaEndpoint QoS
Max_Transport_Latency field, in SelectProperties input parameters and
expected client MediaEndpoint properties.
Put QoS fields to a "QoS" dict in SelectProperties input.
Use the name "Locations" for SelectProperties supported locations input
parameter, to match the MediaEndpoint property name which indicates the
same thing.
---
Notes:
v2: put SelectProperties QoS things to "QoS" dict
profiles/audio/media.c | 41 +++++++++++++++++++++++++++++++----------
1 file changed, 31 insertions(+), 10 deletions(-)
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 8345487d7..4bffc9cde 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -965,7 +965,7 @@ static int pac_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac,
loc = bt_bap_pac_get_locations(rpac);
if (loc)
- g_dbus_dict_append_entry(&dict, "Location", DBUS_TYPE_UINT32,
+ g_dbus_dict_append_entry(&dict, "Locations", DBUS_TYPE_UINT32,
&loc);
if (metadata) {
@@ -977,26 +977,47 @@ static int pac_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac,
}
if (qos && qos->phy) {
- g_dbus_dict_append_entry(&dict, "Framing", DBUS_TYPE_BYTE,
+ DBusMessageIter entry, variant, qos_dict;
+
+ key = "QoS";
+ dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ "a{sv}", &variant);
+ dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY,
+ "{sv}", &qos_dict);
+
+ g_dbus_dict_append_entry(&qos_dict, "PreferredMaximumDelay",
+ DBUS_TYPE_UINT32, &qos->ppd_min);
+
+ g_dbus_dict_append_entry(&qos_dict, "PreferredMaximumDelay",
+ DBUS_TYPE_UINT32, &qos->ppd_min);
+
+ g_dbus_dict_append_entry(&qos_dict, "Framing", DBUS_TYPE_BYTE,
&qos->framing);
- g_dbus_dict_append_entry(&dict, "PHY", DBUS_TYPE_BYTE,
+ g_dbus_dict_append_entry(&qos_dict, "PHY", DBUS_TYPE_BYTE,
&qos->phy);
- g_dbus_dict_append_entry(&dict, "Latency", DBUS_TYPE_UINT16,
- &qos->latency);
+ g_dbus_dict_append_entry(&qos_dict, "MaximumLatency",
+ DBUS_TYPE_UINT16, &qos->latency);
- g_dbus_dict_append_entry(&dict, "MinimumDelay",
+ g_dbus_dict_append_entry(&qos_dict, "MinimumDelay",
DBUS_TYPE_UINT32, &qos->pd_min);
- g_dbus_dict_append_entry(&dict, "MaximumDelay",
+ g_dbus_dict_append_entry(&qos_dict, "MaximumDelay",
DBUS_TYPE_UINT32, &qos->pd_max);
- g_dbus_dict_append_entry(&dict, "PreferredMinimumDelay",
+ g_dbus_dict_append_entry(&qos_dict, "PreferredMinimumDelay",
DBUS_TYPE_UINT32, &qos->ppd_min);
- g_dbus_dict_append_entry(&dict, "PreferredMaximumDelay",
+ g_dbus_dict_append_entry(&qos_dict, "PreferredMaximumDelay",
DBUS_TYPE_UINT32, &qos->ppd_min);
+
+ dbus_message_iter_close_container(&variant, &qos_dict);
+ dbus_message_iter_close_container(&entry, &variant);
+ dbus_message_iter_close_container(&dict, &entry);
}
dbus_message_iter_close_container(&iter, &dict);
@@ -2749,7 +2770,7 @@ static void app_register_endpoint(void *data, void *user_data)
dbus_message_iter_get_basic(&iter, &qos.phy);
}
- if (g_dbus_proxy_get_property(proxy, "Latency", &iter)) {
+ if (g_dbus_proxy_get_property(proxy, "MaximumLatency", &iter)) {
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT16)
goto fail;
--
2.41.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=789673
---Test result---
Test Summary:
CheckPatch PASS 1.96 seconds
GitLint PASS 0.71 seconds
BuildEll PASS 28.57 seconds
BluezMake PASS 880.09 seconds
MakeCheck PASS 12.43 seconds
MakeDistcheck PASS 161.87 seconds
CheckValgrind PASS 263.48 seconds
CheckSmatch PASS 357.03 seconds
bluezmakeextell PASS 109.02 seconds
IncrementalBuild PASS 1436.59 seconds
ScanBuild PASS 1090.66 seconds
---
Regards,
Linux Bluetooth