@@ -2005,10 +2005,7 @@ static unsigned int bap_bcast_enable(struct bt_bap_stream *stream,
bt_bap_stream_func_t func,
void *user_data)
{
- if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE)
- stream_set_state(stream, BT_BAP_STREAM_STATE_STREAMING);
- else
- stream_set_state(stream, BT_BAP_STREAM_STATE_CONFIG);
+ stream_set_state(stream, BT_BAP_STREAM_STATE_CONFIG);
return 1;
}
@@ -5287,7 +5284,6 @@ void bt_bap_cancel_select(struct bt_bap_pac *lpac, bt_bap_pac_select_t func,
static struct bt_bap_stream *bap_bcast_stream_new(struct bt_bap *bap,
struct bt_bap_pac *lpac,
- struct bt_bap_pac *rpac,
struct bt_bap_qos *pqos,
struct iovec *data)
{
@@ -5298,71 +5294,24 @@ static struct bt_bap_stream *bap_bcast_stream_new(struct bt_bap *bap,
if (!bap)
return NULL;
- if (!rpac && (lpac->type != BT_BAP_BCAST_SOURCE)
- && queue_isempty(bap->remote_eps))
- return NULL;
-
- if (lpac && rpac) {
- if ((rpac->type != BT_BAP_BCAST_SOURCE)
- && (!bap_codec_equal(&lpac->codec, &rpac->codec)))
- return NULL;
- } else {
- uint8_t type;
-
+ if (lpac->type == BT_BAP_BCAST_SOURCE) {
match.lpac = lpac;
- match.rpac = rpac;
+ match.rpac = NULL;
memset(&match.codec, 0, sizeof(match.codec));
- if (rpac)
- type = rpac->type;
- else if (lpac) {
- switch (lpac->type) {
- case BT_BAP_BCAST_SOURCE:
- type = BT_BAP_BCAST_SINK;
- break;
- case BT_BAP_BCAST_SINK:
- type = BT_BAP_BCAST_SOURCE;
- break;
- default:
- return NULL;
- }
- } else
- return NULL;
-
- bt_bap_foreach_pac(bap, type, match_pac, &match);
+ bt_bap_foreach_pac(bap, BT_BAP_BCAST_SINK, match_pac, &match);
if ((!match.lpac) || (!lpac))
return NULL;
- if (!match.rpac && (lpac->type != BT_BAP_BCAST_SOURCE))
- return NULL;
lpac = match.lpac;
- rpac = match.rpac;
- }
- match.lpac = lpac;
- match.rpac = rpac;
-
- if (lpac->type != BT_BAP_BCAST_SOURCE) {
- /* Check for existing stream */
- ep = queue_find(bap->remote_eps, find_ep_pacs, &match);
- if (!ep) {
- /* Check for unused ASE */
- ep = queue_find(bap->remote_eps, find_ep_unused,
- &match);
- if (!ep) {
- DBG(bap, "Unable to find unused ASE");
- return NULL;
- }
- }
- stream = ep->stream;
- } else {
ep = queue_find(bap->remote_eps, find_ep_source, NULL);
if (!ep)
return NULL;
}
if (!stream)
- stream = bap_stream_new(bap, ep, lpac, rpac, data, true);
+ stream = bap_stream_new(bap, ep, lpac, NULL, data, true);
return stream;
}
@@ -5415,7 +5364,7 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap,
if (bt_bap_get_att(bap))
return bap_ucast_stream_new(bap, lpac, rpac, pqos, data);
- return bap_bcast_stream_new(bap, lpac, rpac, pqos, data);
+ return bap_bcast_stream_new(bap, lpac, pqos, data);
}
struct bt_bap *bt_bap_stream_get_session(struct bt_bap_stream *stream)