From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx> This adds support for decoding Basic Audio Announcements as shown on: Basic Audio Profile / Profile Specification Page 36 of 146 Table 3.15: Format of BASE used in Basic Audio Announcements < HCI Command: LE Set Periodic Advertising Data (0x08|0x003f) plen 36 Handle: 0 Operation: Complete ext advertising data (0x03) Data length: 0x21 Service Data: Basic Audio Announcement (0x1851) Presetation Delay: 40000 Number of Subgroups: 1 Subgroup #0: Number of BIS(s): 1 Codec: Reserved (0x06) Codec Specific Configuration: 010101020403010000020428 Metadata: 020202 BIS #0: Index: 1 Codec Specific Configuration: --- monitor/bt.h | 28 +++++++++++++ monitor/packet.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/monitor/bt.h b/monitor/bt.h index e9f72de36..644c97c98 100644 --- a/monitor/bt.h +++ b/monitor/bt.h @@ -3517,6 +3517,34 @@ struct bt_hci_evt_le_per_sync_established { uint8_t clock_accuracy; } __attribute__ ((packed)); +struct bt_hci_le_pa_base_codec { + uint8_t id; + uint16_t cid; + uint16_t vid; +} __attribute__ ((packed)); + +struct bt_hci_lv_data { + uint8_t len; + uint8_t data[]; +} __attribute__ ((packed)); + +struct bt_hci_le_pa_base_bis { + uint8_t index; + struct bt_hci_lv_data codec_cfg[]; +} __attribute__ ((packed)); + +struct bt_hci_le_pa_base_subgroup { + uint8_t num_bis; + struct bt_hci_le_pa_base_codec codec; + uint8_t data[]; +} __attribute__ ((packed)); + +struct bt_hci_le_pa_base_data { + uint8_t pd[3]; + uint8_t num_subgroups; + struct bt_hci_le_pa_base_subgroup subgroups[]; +} __attribute__ ((packed)); + #define BT_HCI_EVT_LE_PA_REPORT 0x0f struct bt_hci_le_pa_report { uint16_t handle; diff --git a/monitor/packet.c b/monitor/packet.c index b376d5a8b..9d7677bb1 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -3301,6 +3301,111 @@ static void print_uuid128_list(const char *label, const void *data, } } +static void *iov_pull(struct iovec *iov, size_t len) +{ + void *data; + + if (iov->iov_len < len) + return NULL; + + data = iov->iov_base; + iov->iov_base += len; + iov->iov_len -= len; + + return data; +} + +static void print_base_annoucement(const uint8_t *data, uint8_t data_len) +{ + struct iovec iov; + struct bt_hci_le_pa_base_data *base_data; + uint8_t i; + + iov.iov_base = (void *) data; + iov.iov_len = data_len; + + base_data = iov_pull(&iov, sizeof(*base_data)); + if (!base_data) + goto done; + + /* Level 1 - BASE */ + print_field(" Presetation Delay: %u", get_le24(base_data->pd)); + print_field(" Number of Subgroups: %u", base_data->num_subgroups); + + /* Level 2 - Subgroups*/ + for (i = 0; i < base_data->num_subgroups; i++) { + struct bt_hci_le_pa_base_subgroup *subgroup; + struct bt_hci_lv_data *codec_cfg; + struct bt_hci_lv_data *metadata; + uint8_t j; + + print_field(" Subgroup #%u:", i); + + subgroup = iov_pull(&iov, sizeof(*subgroup)); + if (!subgroup) + goto done; + + print_field(" Number of BIS(s): %u", subgroup->num_bis); + print_codec_id(" Codec", subgroup->codec.id); + + if (subgroup->codec.id == 0xff) { + uint16_t id; + + id = le16_to_cpu(subgroup->codec.vid); + print_field(" Codec Company ID: %s (0x%04x)", + bt_compidtostr(id), id); + print_field(" Codec Vendor ID: 0x%04x", + subgroup->codec.vid); + } + + codec_cfg = iov_pull(&iov, sizeof(*codec_cfg)); + if (!codec_cfg) + goto done; + + if (!iov_pull(&iov, codec_cfg->len)) + goto done; + + print_hex_field(" Codec Specific Configuration", + codec_cfg->data, codec_cfg->len); + + metadata = iov_pull(&iov, sizeof(*metadata)); + if (!metadata) + goto done; + + if (!iov_pull(&iov, metadata->len)) + goto done; + + print_hex_field(" Metadata", metadata->data, metadata->len); + + /* Level 3 - BIS(s)*/ + for (j = 0; j < subgroup->num_bis; j++) { + struct bt_hci_le_pa_base_bis *bis; + + print_field(" BIS #%u:", j); + + bis = iov_pull(&iov, sizeof(*bis)); + if (!bis) + goto done; + + print_field(" Index: %u", bis->index); + + codec_cfg = iov_pull(&iov, sizeof(*codec_cfg)); + if (!codec_cfg) + goto done; + + if (!iov_pull(&iov, codec_cfg->len)) + goto done; + + print_hex_field(" Codec Specific Configuration", + codec_cfg->data, codec_cfg->len); + } + } + +done: + if (iov.iov_len) + print_hex_field(" Data", iov.iov_base, iov.iov_len); +} + static void print_broadcast_annoucement(const uint8_t *data, uint8_t data_len) { uint32_t bid; @@ -3318,6 +3423,7 @@ static const struct service_data_decoder { uint16_t uuid; void (*func)(const uint8_t *data, uint8_t data_len); } service_data_decoders[] = { + { 0x1851, print_base_annoucement }, { 0x1852, print_broadcast_annoucement } }; -- 2.35.1