Remove hardcoded BASE and QoS for broadcast and use the information
from the preset instead.
---
client/player.c | 153 ++++++++++++++++++++++++------------------------
1 file changed, 75 insertions(+), 78 deletions(-)
diff --git a/client/player.c b/client/player.c
index 1bc64af3c..623519209 100644
--- a/client/player.c
+++ b/client/player.c
@@ -94,6 +94,17 @@ struct avdtp_media_codec_capability {
#error "Unknown byte order"
#endif
+/* BAP Broadcast parameters */
+#define BCAST_SYNC_FACTOR 24 /* PA params */
+#define BCAST_OPTIONS 0x00 /* PA Create Sync */
+#define BCAST_SKIP 0x0000 /* PA Create Sync */
+#define BCAST_SYNC_TIMEOUT 0x4000 /* PA Create Sync */
+#define BCAST_SYNC_CTE_TYPE 0x00 /* PA Create Sync */
+#define BCAST_MSE 0x00 /* BIG Create Sync */
+#define BCAST_TIMEOUT 0x4000 /* BIG Create Sync */
+#define BCAST_CODE {0x01, 0x02, 0x68, 0x05, 0x53, 0xf1, 0x41, 0x5a, \
+ 0xa2, 0x65, 0xbb, 0xaf, 0xc6, 0xea, 0x03, 0xb8}
+
struct endpoint {
char *path;
char *uuid;
@@ -127,6 +138,7 @@ static GList *endpoints = NULL;
static GList *local_endpoints = NULL;
static GList *transports = NULL;
static struct queue *ios = NULL;
+static uint8_t bcast_code[] = BCAST_CODE;
struct transport {
GDBusProxy *proxy;
@@ -140,22 +152,6 @@ struct transport {
struct io *timer_io;
};
-static const uint8_t base_lc3_16_2_1[] = {
- 0x28, 0x00, 0x00, /* Presentation Delay */
- 0x01, /* Number of Subgroups */
- 0x01, /* Number of BIS */
- 0x06, 0x00, 0x00, 0x00, 0x00, /* Code ID = LC3 (0x06) */
- 0x10, /* Codec Specific Configuration */
- 0x02, 0x01, 0x03, /* 16 KHZ */
- 0x02, 0x02, 0x01, /* 10 ms */
- 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, /* Front Left */
- 0x03, 0x04, 0x28, 0x00, /* Frame Length 40 bytes */
- 0x04, /* Metadata */
- 0x03, 0x02, 0x02, 0x00, /* Audio Context: Convertional */
- 0x01, /* BIS */
- 0x00, /* Codec Specific Configuration */
-};
-
static void endpoint_unregister(void *data)
{
struct endpoint *ep = data;
@@ -1879,37 +1875,33 @@ static DBusMessage *endpoint_select_configuration(DBusConnection *conn,
struct endpoint_config {
GDBusProxy *proxy;
struct endpoint *ep;
- struct iovec *caps;
- struct iovec *meta;
+ struct iovec *caps; /* Codec Specific Configuration LTVs */
+ struct iovec *meta; /* Metadata LTVs*/
uint8_t target_latency;
- struct codec_qos qos;
-};
-
-#define BCODE {0x01, 0x02, 0x68, 0x05, 0x53, 0xf1, 0x41, 0x5a, \
- 0xa2, 0x65, 0xbb, 0xaf, 0xc6, 0xea, 0x03, 0xb8}
-
-static struct bt_iso_qos bcast_qos = {
- .bcast = {
- .big = BT_ISO_QOS_BIG_UNSET,
- .bis = BT_ISO_QOS_BIS_UNSET,
- .sync_factor = 24,
- .packing = 0x00,
- .framing = 0x00,
- .encryption = 0x00,
- .bcode = BCODE,
- .options = 0x00,
- .skip = 0x0000,
- .sync_timeout = 0x4000,
- .sync_cte_type = 0x00,
- .mse = 0x00,
- .timeout = 0x4000,
- }
+ struct codec_qos qos; /* BAP QOS configuration parameters */
+ uint8_t sync_factor; /* PA parameter */
+ uint8_t options; /* PA create sync parameter */
+ uint16_t skip; /* PA create sync parameter */
+ uint16_t sync_timeout; /* PA create sync parameter */
+ uint8_t sync_cte_type; /* PA create sync parameter */
+ uint8_t mse; /* BIG create sync parameter */
+ uint16_t timeout; /* BIG create sync parameter */
};
static void append_io_qos(DBusMessageIter *iter, struct endpoint_config *cfg)
{
struct codec_qos *qos = &cfg->qos;
+ bt_shell_printf("Framing 0x%02x\n", qos->framing);
+
+ g_dbus_dict_append_entry(iter, "Framing", DBUS_TYPE_BYTE,
+ &qos->framing);
+
+ bt_shell_printf("PresentationDelay %u\n", qos->delay);
+
+ g_dbus_dict_append_entry(iter, "PresentationDelay",
+ DBUS_TYPE_UINT32, &qos->delay);
+
bt_shell_printf("Interval %u\n", qos->interval);
g_dbus_dict_append_entry(iter, "Interval", DBUS_TYPE_UINT32,
@@ -1971,59 +1963,54 @@ static void append_ucast_qos(DBusMessageIter *iter, struct endpoint_config *cfg)
static void append_bcast_qos(DBusMessageIter *iter, struct endpoint_config *cfg)
{
- if (bcast_qos.bcast.big != BT_ISO_QOS_BIG_UNSET) {
- bt_shell_printf("BIG 0x%2.2x\n", bcast_qos.bcast.big);
+ if (cfg->ep->iso_group != BT_ISO_QOS_BIG_UNSET) {
+ bt_shell_printf("BIG 0x%2.2x\n", cfg->ep->iso_group);
g_dbus_dict_append_entry(iter, "BIG", DBUS_TYPE_BYTE,
- &bcast_qos.bcast.big);
+ &cfg->ep->iso_group);
}
- if (bcast_qos.bcast.bis != BT_ISO_QOS_BIS_UNSET) {
- bt_shell_printf("BIS 0x%2.2x\n", bcast_qos.bcast.bis);
+ if (cfg->ep->iso_stream != BT_ISO_QOS_BIS_UNSET) {
+ bt_shell_printf("BIS 0x%2.2x\n", cfg->ep->iso_stream);
g_dbus_dict_append_entry(iter, "BIS", DBUS_TYPE_BYTE,
- &bcast_qos.bcast.bis);
+ &cfg->ep->iso_stream);
}
- bt_shell_printf("Framing 0x%02x\n", bcast_qos.bcast.framing);
-
- g_dbus_dict_append_entry(iter, "Framing", DBUS_TYPE_BYTE,
- &bcast_qos.bcast.framing);
-
- bt_shell_printf("SyncFactor %u\n", bcast_qos.bcast.sync_factor);
+ bt_shell_printf("SyncFactor %u\n", cfg->sync_factor);
g_dbus_dict_append_entry(iter, "SyncFactor", DBUS_TYPE_BYTE,
- &bcast_qos.bcast.sync_factor);
+ &cfg->sync_factor);
- bt_shell_printf("Options %u\n", bcast_qos.bcast.options);
+ bt_shell_printf("Options %u\n", cfg->options);
g_dbus_dict_append_entry(iter, "Options", DBUS_TYPE_BYTE,
- &bcast_qos.bcast.options);
+ &cfg->options);
- bt_shell_printf("Skip %u\n", bcast_qos.bcast.skip);
+ bt_shell_printf("Skip %u\n", cfg->skip);
g_dbus_dict_append_entry(iter, "Skip", DBUS_TYPE_UINT16,
- &bcast_qos.bcast.skip);
+ &cfg->skip);
- bt_shell_printf("SyncTimeout %u\n", bcast_qos.bcast.sync_timeout);
+ bt_shell_printf("SyncTimeout %u\n", cfg->sync_timeout);
g_dbus_dict_append_entry(iter, "SyncTimeout", DBUS_TYPE_UINT16,
- &bcast_qos.bcast.sync_timeout);
+ &cfg->sync_timeout);
- bt_shell_printf("SyncCteType %u\n", bcast_qos.bcast.sync_cte_type);
+ bt_shell_printf("SyncCteType %u\n", cfg->sync_cte_type);
g_dbus_dict_append_entry(iter, "SyncType", DBUS_TYPE_BYTE,
- &bcast_qos.bcast.sync_cte_type);
+ &cfg->sync_cte_type);
- bt_shell_printf("MSE %u\n", bcast_qos.bcast.mse);
+ bt_shell_printf("MSE %u\n", cfg->mse);
g_dbus_dict_append_entry(iter, "MSE", DBUS_TYPE_BYTE,
- &bcast_qos.bcast.mse);
+ &cfg->mse);
- bt_shell_printf("Timeout %u\n", bcast_qos.bcast.timeout);
+ bt_shell_printf("Timeout %u\n", cfg->timeout);
g_dbus_dict_append_entry(iter, "Timeout", DBUS_TYPE_UINT16,
- &bcast_qos.bcast.timeout);
+ &cfg->timeout);
- if (cfg->ep->bcode) {
+ if (cfg->ep->bcode->iov_len != 0) {
const char *key = "BCode";
bt_shell_printf("BCode:\n");
@@ -2036,6 +2023,7 @@ static void append_bcast_qos(DBusMessageIter *iter, struct endpoint_config *cfg)
cfg->ep->bcode->iov_len);
}
+ /* Add BAP codec QOS configuration */
append_io_qos(iter, cfg);
}
@@ -3667,22 +3655,31 @@ static void cmd_config_endpoint(int argc, char *argv[])
goto fail;
}
- if (cfg->ep->broadcast) {
- iov_append(&cfg->ep->bcode, bcast_qos.bcast.bcode,
- sizeof(bcast_qos.bcast.bcode));
- /* Copy capabilities for broadcast*/
- iov_append(&cfg->caps, base_lc3_16_2_1,
- sizeof(base_lc3_16_2_1));
- } else {
- /* Copy capabilities */
- iov_append(&cfg->caps, preset->data.iov_base,
- preset->data.iov_len);
- }
+ /* Copy capabilities */
+ iov_append(&cfg->caps, preset->data.iov_base,
+ preset->data.iov_len);
/* Set QoS parameters */
cfg->qos = preset->qos;
- endpoint_set_config(cfg);
+ if (cfg->ep->broadcast) {
+ cfg->ep->bcode = g_new0(struct iovec, 1);
+ iov_append(&cfg->ep->bcode, bcast_code,
+ sizeof(bcast_code));
+
+ /* Add periodic advertisement parameters */
+ cfg->sync_factor = BCAST_SYNC_FACTOR;
+ cfg->options = BCAST_OPTIONS;
+ cfg->skip = BCAST_SKIP;
+ cfg->sync_timeout = BCAST_SYNC_TIMEOUT;
+ cfg->sync_cte_type = BCAST_SYNC_CTE_TYPE;
+ /* Add BIG create sync parameters */
+ cfg->mse = BCAST_MSE;
+ cfg->timeout = BCAST_TIMEOUT;
+
+ endpoint_set_config(cfg);
+ } else
+ endpoint_set_config(cfg);
return;
}
--
2.39.2
