After short-lived PA sync, this adds a call to probe the bap session
with the Broadcaster with BASS.
If the BAP Broadcast Sink has probed the Broadcaster autonomously,
the short lived PA sync io is closed immediately, since PA sync needs
to be terminated so other Broadcasters can be probed next. If the BAP
Broadcast Sink is acting as a Scan Delegator and the probed Broadcaster
was added by a Broadcast Assistant, PA sync needs to remain active (it
should be terminated only on Broadcast Assistant command).
This commit updates the way short-lived PA sync is handled in case of
a Scan Delegator use case: A reference to PA sync io is kept inside
data->listen_io, to keep the sync active. The PA sync request is also
kept in progress in the adapter queue, so that no other short-lived PA
syncs will be attempted. Once the BAP data is freed, the listen_io will
be closed and the PA sync request will be dequeued and freed as well.
Then, other Broadcasters will continue to be probed.
This also adds a call to notify BASS about a session with a Broadcaster
being removed, in bap_bcast_remove.
The bluetoothctl log below shows a Scan Delegator creating a media
transport for a BIS added by a Broadcast Assistant through the
Add Source command, and then disconnecting from the Broadcaster:
client/bluetoothctl
[bluetooth]# endpoint.register 00001851-0000-1000-8000-00805f9b34fb 0x06
[/local/endpoint/ep0] Auto Accept (yes/no): y
[/local/endpoint/ep0] Max Transports (auto/value): a
[/local/endpoint/ep0] Locations: 1
[/local/endpoint/ep0] Supported Context (value): 1
[bluetooth]# Endpoint /local/endpoint/ep0 registered
[bluetooth]# advertise on
[bluetooth]# [NEW] Device 00:60:37:31:7E:3F 00-60-37-31-7E-3F
[00-60-37-31-7E-3F]# [NEW] Device 03:E2:C0:11:57:DA 03-E2-C0-11-57-DA
[00-60-37-31-7E-3F]# [NEW] Transport
/org/bluez/hci1/dev_03_E2_C0_11_57_DA/bis1/fd0
[00-60-37-31-7E-3F]# disconnect 03:E2:C0:11:57:DA
Attempting to disconnect from 03:E2:C0:11:57:DA
[00-60-37-31-7E-3F]# [DEL] Transport
/org/bluez/hci1/dev_03_E2_C0_11_57_DA/bis1/fd0
[00-60-37-31-7E-3F]# [DEL] Device 03:E2:C0:11:57:DA 03-E2-C0-11-57-DA
The btmon log below shows that after PA sync is established inside
the BAP plugin, the Scan Delegator sends a GATT notification to
inform the Broadcast Assistant that PA sync has been established.
Once the Broadcaster device is deleted, PA sync is terminated and
the Scan Delegator once again notifies the peer about the update:
> ACL Data RX: Handle 0 flags 0x01 dlen 1
ATT: Write Command (0x52) len 23
Handle: 0x0040 Type: Broadcast Audio Scan Control Point (0x2bc7)
Data[21]: 0201da5711c0e203001a2d5602ffff010100000000
Opcode: Add Source (0x02)
Source_Address_Type: 1
Source_Address: 03:E2:C0:11:57:DA
Source_Adv_SID: 0
Broadcast_ID: 0x562d1a
PA_Sync_State: Synchronize to PA - PAST not available
PA_Interval: 0xffff
Num_Subgroups: 1
Subgroup #0:
BIS_Sync State: 0x00000001
< HCI Command: LE Periodic Advertising Create Sync (0x08|0x0044)
Options: 0x0000
Use advertising SID, Advertiser Address Type and address
Reporting initially enabled
SID: 0x00
Adv address type: Random (0x01)
Adv address: 03:E2:C0:11:57:DA (Non-Resolvable)
Skip: 0x0000
Sync timeout: 20000 msec (0x07d0)
Sync CTE type: 0x0000
> HCI Event: Command Status (0x0f) plen 4
LE Periodic Advertising Create Sync (0x08|0x0044) ncmd 1
Status: Success (0x00)
> HCI Event: LE Meta Event (0x3e) plen 16
LE Periodic Advertising Sync Established (0x0e)
Status: Success (0x00)
Sync handle: 0
Advertising SID: 0x00
Advertiser address type: Random (0x01)
Advertiser address: 03:E2:C0:11:57:DA (Non-Resolvable)
Advertiser PHY: LE 2M (0x02)
Periodic advertising interval: 10.00 msec (0x0008)
Advertiser clock accuracy: 0x07
> HCI Event: LE Meta Event (0x3e) plen 42
LE Periodic Advertising Report (0x0f)
Sync handle: 0
TX power: 127 dbm (0x7f)
RSSI: -64 dBm (0xc0)
CTE Type: No Constant Tone Extension (0xff)
Data status: Complete
Data length: 0x22
Service Data: Basic Audio Announcement (0x1851)
Presetation Delay: 40000
Number of Subgroups: 1
Subgroup #0:
Number of BIS(s): 1
Codec: LC3 (0x06)
Codec Specific Configuration: #0: len 0x02 type 0x01
Codec Specific Configuration: Sampling Frequency: 16 Khz
Codec Specific Configuration: #1: len 0x02 type 0x02
Codec Specific Configuration: Frame Duration: 10 ms (0x01)
Codec Specific Configuration: #2: len 0x03 type 0x04
Codec Specific Configuration: Frame Length: 40 (0x0028)
Codec Specific Configuration: #3: len 0x05 type 0x03
Codec Specific Configuration: Location: 0x00000001
Codec Specific Configuration: Location: Front Left
BIS #0:
Index: 1
> HCI Event: LE Meta Event (0x3e) plen 20
LE Broadcast Isochronous Group Info Advertising Report (0x22)
Sync Handle: 0x0000
Number BIS: 1
NSE: 3
ISO Interval: 10.00 msec (0x0008)
BN: 1
PTO: 1
IRC: 3
Maximum PDU: 40
SDU Interval: 10000 us (0x002710)
Maximum SDU: 40
PHY: LE 2M (0x02)
Framing: Unframed (0x00)
Encryption: 0x00
bluetoothd[4636]: < ACL Data TX: Handle 0 flags 0x00 dlen 29
ATT: Handle Multiple Value Notification (0x23) len 24
Length: 0x0014
Handle: 0x003a Type: Broadcast Receive State (0x2bc8)
Data[20]: 0101da5711c0e203001a2d560200010000000000
Source_ID: 1
Source_Address_Type: 1
Source_Address: 03:E2:C0:11:57:DA
Source_Adv_SID: 0
Broadcast_ID: 0x562d1a
PA_Sync_State: Synchronized to PA
BIG_Encryption: Not encrypted
Num_Subgroups: 1
Subgroup #0:
BIS_Sync State: 0x00000000
bluetoothd[70621]: < ACL Data TX: Handle 0 flags 0x00 dlen 29
ATT: Handle Multiple Value Notification (0x23) len 24
Length: 0x0014
Handle: 0x003a Type: Broadcast Receive State (0x2bc8)
Data[20]: 0101dd7c8046f72a00f863f00000010000000000
Source_ID: 1
Source_Address_Type: 1
Source_Address: 2A:F7:46:80:7C:DD
Source_Adv_SID: 0
Broadcast_ID: 0xf063f8
PA_Sync_State: Not synchronized to PA
BIG_Encryption: Not encrypted
Num_Subgroups: 1
Subgroup #0:
BIS_Sync State: 0x00000000
< HCI Command: LE Periodic Advertising Terminate Sync (0x08|0x0046) plen 2
Sync handle: 0x0000
> HCI Event: Command Complete (0x0e) plen 4
LE Periodic Advertising Terminate Sync (0x08|0x0046) ncmd 1
Status: Success (0x00
---
profiles/audio/bap.c | 128 ++++++++++++++++++++++++++++++++-----------
1 file changed, 95 insertions(+), 33 deletions(-)
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index a2c5a546d..bf924932a 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -182,6 +182,9 @@ static struct bt_iso_qos bap_sink_pa_qos = {
}
};
+static bool match_service(const void *data, const void *match_data);
+static void iso_do_big_sync(GIOChannel *io, void *user_data);
+
static bool bap_data_set_user_data(struct bap_data *data, void *user_data)
{
if (!data)
@@ -211,6 +214,8 @@ static void setup_free(void *data);
static void bap_data_free(struct bap_data *data)
{
+ struct bap_bcast_pa_req *req;
+
if (data->listen_io) {
g_io_channel_shutdown(data->listen_io, TRUE, NULL);
g_io_channel_unref(data->listen_io);
@@ -230,6 +235,22 @@ static void bap_data_free(struct bap_data *data)
bt_bap_state_unregister(data->bap, data->state_id);
bt_bap_pac_unregister(data->bap, data->pac_id);
bt_bap_unref(data->bap);
+
+ if (data->adapter) {
+ /* If this is a Broadcast Sink session with a Broadcast Source,
+ * remove any pending PA sync requests from the adapter queue,
+ * since the session is about to be deleted.
+ */
+ req = queue_remove_if(data->adapter->bcast_pa_requests,
+ match_service, data->service);
+ if (req && req->io_id) {
+ g_source_remove(req->io_id);
+ req->io_id = 0;
+ }
+
+ free(req);
+ }
+
free(data);
}
@@ -1004,9 +1025,11 @@ static void iso_bcast_confirm_cb(GIOChannel *io, GError *err, void *user_data)
DBG("BIG Sync completed");
- g_io_channel_unref(setup->io);
- g_io_channel_shutdown(setup->io, TRUE, NULL);
- setup->io = NULL;
+ if (setup->io) {
+ g_io_channel_unref(setup->io);
+ g_io_channel_shutdown(setup->io, TRUE, NULL);
+ setup->io = NULL;
+ }
/* This device is no longer needed */
btd_service_connecting_complete(bap_data->service, 0);
@@ -1258,9 +1281,25 @@ static gboolean big_info_report_cb(GIOChannel *io, GIOCondition cond,
/* Close the io and remove the queue request for another PA Sync */
g_io_channel_shutdown(data->listen_io, TRUE, NULL);
g_io_channel_unref(data->listen_io);
- g_io_channel_shutdown(io, TRUE, NULL);
data->listen_io = NULL;
+ if (bass_bcast_probe(data->device, data->bap)) {
+ /* If this Broadcast Source was successfully probed inside
+ * BASS, it means that the Broadcast Sink acting as a Scan
+ * Delegator performed short-lived PA sync as a request from
+ * a Broadcast Assistant. The Scan Delegator should keep PA
+ * sync active until instructed otherwise by the Assistant.
+ * Keep a reference to the PA sync io to keep the fd open.
+ */
+ data->listen_io = io;
+ g_io_channel_ref(io);
+ } else {
+ /* Unless it is required by a Broadcast Assistant, PA sync is
+ * no longer needed at this point, so the io can be closed.
+ */
+ g_io_channel_shutdown(io, TRUE, NULL);
+ }
+
/* Analyze received BASE data and create remote media endpoints for each
* BIS matching our capabilities
*/
@@ -1268,9 +1307,18 @@ static gboolean big_info_report_cb(GIOChannel *io, GIOCondition cond,
service_set_connecting(req->data.service);
- queue_remove(data->adapter->bcast_pa_requests, req);
req->io_id = 0;
- free(req);
+
+ if (!data->listen_io) {
+ /* If PA sync has been terminated, dequeue request to be able
+ * to probe other Broadcasters. Otherwise, keep this request
+ * in progress to avoid probing other Broadcasters as long as
+ * PA is active with the current one. The request will be
+ * dequeued and freed when the PA sync io will be shutdown.
+ */
+ queue_remove(data->adapter->bcast_pa_requests, req);
+ free(req);
+ }
return FALSE;
}
@@ -2236,6 +2284,26 @@ static void setup_accept_io_broadcast(struct bap_data *data,
struct bap_bcast_pa_req *req = new0(struct bap_bcast_pa_req, 1);
struct bap_adapter *adapter = data->adapter;
+ req->type = BAP_PA_BIG_SYNC_REQ;
+ req->in_progress = FALSE;
+ req->data.setup = setup;
+
+ if (data->listen_io) {
+ /* If there is an active listen io for the BAP session
+ * with the Broadcast Source, it means that PA sync is
+ * already established. Go straight to establishing BIG
+ * sync.
+ */
+ iso_do_big_sync(data->listen_io, req);
+ return;
+ }
+
+ /* Add this request to the PA queue.
+ * We don't need to check the queue here, as we cannot have
+ * BAP_PA_BIG_SYNC_REQ before a short PA (BAP_PA_SHORT_REQ)
+ */
+ queue_push_tail(adapter->bcast_pa_requests, req);
+
/* Timer could be stopped if all the short lived requests were treated.
* Check the state of the timer and turn it on so that this requests
* can also be treated.
@@ -2244,15 +2312,6 @@ static void setup_accept_io_broadcast(struct bap_data *data,
adapter->pa_timer_id = g_timeout_add_seconds(PA_IDLE_TIMEOUT,
pa_idle_timer,
adapter);
-
- /* Add this request to the PA queue.
- * We don't need to check the queue here, as we cannot have
- * BAP_PA_BIG_SYNC_REQ before a short PA (BAP_PA_SHORT_REQ)
- */
- req->type = BAP_PA_BIG_SYNC_REQ;
- req->in_progress = FALSE;
- req->data.setup = setup;
- queue_push_tail(adapter->bcast_pa_requests, req);
}
static void setup_create_ucast_io(struct bap_data *data,
@@ -3030,10 +3089,17 @@ static void iso_do_big_sync(GIOChannel *io, void *user_data)
const char *strbis = NULL;
DBG("PA Sync done");
- g_io_channel_unref(setup->io);
- g_io_channel_shutdown(setup->io, TRUE, NULL);
- setup->io = io;
- g_io_channel_ref(setup->io);
+
+ if (setup->io) {
+ g_io_channel_unref(setup->io);
+ g_io_channel_shutdown(setup->io, TRUE, NULL);
+
+ /* Keep a reference to the PA sync io until
+ * BIG sync is established.
+ */
+ setup->io = io;
+ g_io_channel_ref(setup->io);
+ }
/* TODO
* We can only synchronize with a single BIS to a BIG.
@@ -3086,14 +3152,14 @@ static void iso_do_big_sync(GIOChannel *io, void *user_data)
memcpy(&qos.bcast.out, &setup->qos.bcast.io_qos,
sizeof(struct bt_iso_io_qos));
- if (!bt_io_set(setup->io, &err,
+ if (!bt_io_set(io, &err,
BT_IO_OPT_QOS, &qos,
BT_IO_OPT_INVALID)) {
error("bt_io_set: %s", err->message);
g_error_free(err);
}
- if (!bt_io_bcast_accept(setup->io,
+ if (!bt_io_bcast_accept(io,
iso_bcast_confirm_cb,
req, NULL, &err,
BT_IO_OPT_ISO_BC_NUM_BIS,
@@ -3211,7 +3277,6 @@ static void bap_bcast_remove(struct btd_service *service)
{
struct btd_device *device = btd_service_get_device(service);
struct bap_data *data;
- struct bap_bcast_pa_req *req;
char addr[18];
ba2str(device_get_address(device), addr);
@@ -3222,17 +3287,9 @@ static void bap_bcast_remove(struct btd_service *service)
error("BAP service not handled by profile");
return;
}
- /* Remove the corresponding entry from the pa_req queue. Any pa_req that
- * are in progress will be stopped by bap_data_remove which calls
- * bap_data_free.
- */
- req = queue_remove_if(data->adapter->bcast_pa_requests,
- match_service, service);
- if (req && req->io_id) {
- g_source_remove(req->io_id);
- req->io_id = 0;
- }
- free(req);
+
+ /* Notify the BASS plugin about the removed session. */
+ bass_bcast_remove(device);
bap_data_remove(data);
@@ -3393,8 +3450,13 @@ static void bap_adapter_remove(struct btd_profile *p,
DBG("%s", addr);
queue_destroy(data->adapter->bcast_pa_requests, free);
+
+ if (data->adapter->pa_timer_id)
+ g_source_remove(data->adapter->pa_timer_id);
+
queue_remove(adapters, data->adapter);
free(data->adapter);
+ data->adapter = NULL;
if (queue_isempty(adapters)) {
queue_destroy(adapters, NULL);
--
2.39.2
