Fix the case when registering both sink and source endpoints,
the register endpoint method call results in 2 remote endpoints
for each scanned broadcast source.
Remove the need of a remote pac when creating a broadcast stream.
---
src/shared/bap.c | 73 ++++++++++++++++++++++++------------------------
src/shared/bap.h | 3 ++
2 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 925501c48..665cd76b0 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -644,7 +644,7 @@ static struct bt_bap_endpoint *bap_endpoint_new_broadcast(struct bt_bap_db *bdb,
if (type == BT_BAP_BCAST_SINK)
ep->dir = BT_BAP_BCAST_SOURCE;
else
- ep->dir = BT_BAP_BCAST_SINK;
+ ep->dir = 0;
return ep;
}
@@ -1500,12 +1500,12 @@ static void ep_config_cb(struct bt_bap_stream *stream, int err)
return;
if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BCAST) {
- if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)
+ if (!bt_bap_stream_io_dir(stream))
stream_set_state_broadcast(stream,
- BT_BAP_STREAM_STATE_QOS);
+ BT_BAP_STREAM_STATE_QOS);
else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE)
stream_set_state_broadcast(stream,
- BT_BAP_STREAM_STATE_CONFIG);
+ BT_BAP_STREAM_STATE_CONFIG);
return;
}
@@ -2682,7 +2682,7 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
struct iovec *metadata)
{
struct bt_bap_db *bdb;
- struct bt_bap_pac *pac, *pac_broadcast_sink;
+ struct bt_bap_pac *pac;
struct bt_bap_codec codec;
if (!db)
@@ -2710,15 +2710,6 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
break;
case BT_BAP_BCAST_SOURCE:
bap_add_broadcast_source(pac);
- if (queue_isempty(bdb->broadcast_sinks)) {
- /* When adding a local broadcast source, add also a
- * local broadcast sink
- */
- pac_broadcast_sink = bap_pac_new(bdb, name,
- BT_BAP_BCAST_SINK, &codec, qos,
- data, metadata);
- bap_add_broadcast_sink(pac_broadcast_sink);
- }
break;
case BT_BAP_BCAST_SINK:
bap_add_broadcast_sink(pac);
@@ -4482,21 +4473,12 @@ void bt_bap_foreach_pac(struct bt_bap *bap, uint8_t type,
func, user_data);
case BT_BAP_SOURCE:
return bap_foreach_pac(bap->ldb->sinks, bap->rdb->sources,
- func, user_data);
+ func, user_data);
case BT_BAP_BCAST_SOURCE:
- if (queue_isempty(bap->rdb->broadcast_sources)
- && queue_isempty(bap->rdb->broadcast_sinks))
- return bap_foreach_pac(bap->ldb->broadcast_sources,
- bap->ldb->broadcast_sinks,
- func, user_data);
-
- return bap_foreach_pac(bap->ldb->broadcast_sinks,
- bap->rdb->broadcast_sources,
- func, user_data);
case BT_BAP_BCAST_SINK:
return bap_foreach_pac(bap->ldb->broadcast_sinks,
- bap->rdb->broadcast_sources,
- func, user_data);
+ bap->rdb->broadcast_sources,
+ func, user_data);
}
}
@@ -4541,6 +4523,20 @@ void *bt_bap_pac_get_user_data(struct bt_bap_pac *pac)
return pac->user_data;
}
+bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac)
+{
+ if (!bap->ldb)
+ return false;
+
+ if (queue_find(bap->ldb->broadcast_sinks, NULL, pac))
+ return true;
+
+ if (queue_find(bap->ldb->broadcast_sources, NULL, pac))
+ return true;
+
+ return false;
+}
+
static bool find_ep_unused(const void *data, const void *user_data)
{
const struct bt_bap_endpoint *ep = data;
@@ -4549,7 +4545,10 @@ static bool find_ep_unused(const void *data, const void *user_data)
if (ep->stream)
return false;
- return ep->dir == match->rpac->type;
+ if (match->rpac)
+ return ep->dir == match->rpac->type;
+ else
+ return true;
}
static bool find_ep_pacs(const void *data, const void *user_data)
@@ -4708,7 +4707,11 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap,
struct bt_bap_endpoint *ep;
struct match_pac match;
- if (!bap || !bap->rdb || queue_isempty(bap->remote_eps))
+ if (!bap)
+ return NULL;
+
+ if (!rpac && (lpac->type != BT_BAP_BCAST_SOURCE)
+ && queue_isempty(bap->remote_eps))
return NULL;
if (lpac && rpac) {
@@ -4745,7 +4748,9 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap,
return NULL;
bt_bap_foreach_pac(bap, type, match_pac, &match);
- if (!match.lpac || !match.rpac)
+ if (!match.lpac)
+ return NULL;
+ if (!match.rpac && (lpac->type != BT_BAP_BCAST_SOURCE))
return NULL;
lpac = match.lpac;
@@ -4927,12 +4932,12 @@ unsigned int bt_bap_stream_enable(struct bt_bap_stream *stream,
queue_foreach(stream->links, bap_stream_enable_link, metadata);
break;
case BT_BAP_STREAM_TYPE_BCAST:
- if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)
+ if (!bt_bap_stream_io_dir(stream))
stream_set_state_broadcast(stream,
- BT_BAP_STREAM_STATE_CONFIG);
+ BT_BAP_STREAM_STATE_CONFIG);
else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE)
stream_set_state_broadcast(stream,
- BT_BAP_STREAM_STATE_STREAMING);
+ BT_BAP_STREAM_STATE_STREAMING);
return 1;
}
@@ -5465,10 +5470,6 @@ bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name)
struct bt_bap_endpoint *ep;
struct bt_bap_pac *pac_broadcast_source;
- /* Add the remote source only if a local sink endpoint was registered */
- if (queue_isempty(bap->ldb->broadcast_sinks))
- return false;
-
/* Add the remote source only if a local sink endpoint was registered */
if (queue_isempty(bap->ldb->broadcast_sinks))
return false;
diff --git a/src/shared/bap.h b/src/shared/bap.h
index ebe4dbf7d..edc88c834 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -320,3 +320,6 @@ void bt_bap_update_bcast_source(struct bt_bap_pac *pac,
struct bt_bap_codec *codec,
struct iovec *data,
struct iovec *metadata);
+
+bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac);
+
--
2.39.2
