From: Andrei Istodorescu <andrei.istodorescu@nxp.com>
To: linux-bluetooth@vger.kernel.org
Cc: luiz.dentz@gmail.com, mihai-octavian.urzica@nxp.com,
silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
iulia.tanasescu@nxp.com,
Andrei Istodorescu <andrei.istodorescu@nxp.com>
Subject: [PATCH BlueZ v5 1/6] shared/bap: Update stream management to avoid PACs
Date: Thu, 16 May 2024 16:03:55 +0300 [thread overview]
Message-ID: <20240516130400.16713-2-andrei.istodorescu@nxp.com> (raw)
In-Reply-To: <20240516130400.16713-1-andrei.istodorescu@nxp.com>
Remove PAC logic for BAP Broadcast Sink stream creation.
---
src/shared/bap.c | 63 +++++-------------------------------------------
1 file changed, 6 insertions(+), 57 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 1316d7c73d02..919ecbb6a016 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -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)
--
2.40.1
next prev parent reply other threads:[~2024-05-16 13:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 13:03 [PATCH BlueZ v5 0/6] Create transports for matching BISes Andrei Istodorescu
2024-05-16 13:03 ` Andrei Istodorescu [this message]
2024-05-16 16:53 ` bluez.test.bot
2024-05-16 13:03 ` [PATCH BlueZ v5 2/6] shared/bap: Add function to check the validity of a BIS Andrei Istodorescu
2024-05-16 13:03 ` [PATCH BlueZ v5 3/6] bap: Update BIS management Andrei Istodorescu
2024-05-16 13:03 ` [PATCH BlueZ v5 4/6] shared/bap: Remove not needed function Andrei Istodorescu
2024-05-16 13:03 ` [PATCH BlueZ v5 5/6] shared/bap: Return the local PAC when matching a BIS Andrei Istodorescu
2024-05-16 13:04 ` [PATCH BlueZ v5 6/6] shared/bap: Add stream ops for get_location, get_dir and get_state Andrei Istodorescu
2024-05-16 17:40 ` [PATCH BlueZ v5 0/6] Create transports for matching BISes patchwork-bot+bluetooth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240516130400.16713-2-andrei.istodorescu@nxp.com \
--to=andrei.istodorescu@nxp.com \
--cc=iulia.tanasescu@nxp.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=mihai-octavian.urzica@nxp.com \
--cc=silviu.barbulescu@nxp.com \
--cc=vlad.pruteanu@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).