Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
From:   Silviu Florian Barbulescu <silviu.barbulescu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
        andrei.istodorescu@nxp.com, luiz.dentz@gmail.com,
        iulia.tanasescu@nxp.com
Subject: [PATCH 6/6] client/player.c: Add support for multiple BISes
Date:   Thu, 26 Oct 2023 17:50:47 +0300
Message-Id: <20231026145047.4637-7-silviu.barbulescu@nxp.com>
In-Reply-To: <20231026145047.4637-1-silviu.barbulescu@nxp.com>
References: <20231026145047.4637-1-silviu.barbulescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vrzgiOEeeM+gkmDP0CDccfk6ccl8M2rjuzm9lktOy4VUgNEApHVQ2Vcyx9EP?=
 =?us-ascii?Q?qbhPmgcMXgtrzElT+Qg1uiDZDyJ31Uk6oJqjuc75F6owyEQmAF9KRGlrrf+k?=
 =?us-ascii?Q?I1rp5mL/X5c4J+qU+h05XyXP98KMUwAy/z4smjnRKrXHbtegd6laIqM9G9Vn?=
 =?us-ascii?Q?khpsgEQCgLlMIQnaTcXj8EkDWih599AYBiMbpHxbTrFV/BXpJf4zB7rI7H05?=
 =?us-ascii?Q?hY/bUsb5kM8+GVefeKfc5Hg5Gp/SElvrDMUJBj7QE8ZhvHoq0yOznU0ldKRH?=
 =?us-ascii?Q?3ZQk0GTxANSz1ZNBGT5nhp9JN1g79Etx/blljMSoW5TUs+cvzqIsihcfVeDB?=
 =?us-ascii?Q?2I22KRGxyIYZ4WhBFF9A/lzqqE29I23oQwup7uDsXBKD7PBEBLvYPS1+zcuF?=
 =?us-ascii?Q?UOWCBIMuSmbYO41aSRb7D6sn3R6aZIALsvIQbyln3dZnKG4qWmac8YfQOmeS?=
 =?us-ascii?Q?LKlpHe0VF9iIQEZ3R0dDAId3gqzQx/YSVym8dcdl/9bLHRuRvtdJfhsNBl8g?=
 =?us-ascii?Q?WFC3Cx/UkctT/ORkjKXDkdwaZ9OC25ODKDc4uXFqFmP3HxoSUVbF30zudFlq?=
 =?us-ascii?Q?Uk+Fp/RUv1ta+1/3Zu8zdDT1aflzOZG6p/0XCjMrPbt3SykGOuZVo6Uvu0A3?=
 =?us-ascii?Q?tN2F3FVxNSy5MQbXvRwVXpcI2paeoOS2JfWgLXfgD5RrnPLgrky1Cth1gaww?=
 =?us-ascii?Q?JkLb6o5u9KC+6s3NC6Nousuhm90P6pQEg5sAyhJsqonL2lcUNZ4vcp2DKHfg?=
 =?us-ascii?Q?9uGBi4FNN47un2KbnzVDwOkXboMiBS1+D9iaV2QMaVMxnQ5W4h0yWSQjv9qE?=
 =?us-ascii?Q?v+HYT6MsEoQFN37FO3T/LLpjskhbMlc4PpTD6z2+kZjb5NXhjEFWFjz7Xvsd?=
 =?us-ascii?Q?hnrw5kdzELNcebWv9ielTQekmrwNu+d5qOmrhlaEnpmLZ5TsBtaed84+FkP+?=
 =?us-ascii?Q?G/FJacEBdwr9DLX5TCIEs6+aiMjaP2Stb2ESAdkf5fH9hiu4Yo8hwMu2qY3h?=
 =?us-ascii?Q?qmJWyKKijQRW38KrR3l6bW1ZSCXyN/1FuW8mnhkpuIaPBkVbfJNEXQIdSVS4?=
 =?us-ascii?Q?Er/ppmon0fFBd9Ffa5WiPwFYsFPbftcf+ZOYOQNTKy3PrnjYT9nmP0PAwh42?=
 =?us-ascii?Q?lrDqbrh/9g3Wum1iTA+z9ewO39oyN8L3nM/05CSZVLeaO6soFPupGVKFSE1e?=
 =?us-ascii?Q?o6XDf0dq6z0aklaiv6bRcdOQWuaM9y8N+SEuvaZtTOE1kSyKGQJuZNmPiBH0?=
 =?us-ascii?Q?0Vm4r4MHBrPNq3oUPsnhaoPOXDpWRuVPvKhU7tCmvhky9EGG7VbabBY27lyF?=
 =?us-ascii?Q?edRnKOiSUG9jr4cJNApX9Li3aCKCL/1dFnNOg47H1Rku5O228hw1wK4kjk/A?=
 =?us-ascii?Q?Udnunk/Lx+evXRaLCNle51C/G4+Y6NACBprE5stIykwbEq+SwLGiD6VpvoQK?=
 =?us-ascii?Q?T068P9Apb2KWCkstUANMYUmKAN28wWDxSEd4TUJuIkQpf8f4vFR8AckxTNRu?=
 =?us-ascii?Q?IvceuF4oQNXEG2k6uBy0J8OPo8Pv4L8qYf3c+vPiRksEyQi+9xwVdtlyIOnp?=
 =?us-ascii?Q?wXBKxnDq5+CcHzvtoekmWNsJn8Z7l3dvAnFUBXvnjvULTPBY3hdesrqKfoGP?=
 =?us-ascii?Q?pg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 519c5b50-cb31-45db-3e98-08dbd63301ad
X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 14:51:16.4648
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CO2Jmis/ZfKfFN0Y8u2z3Lv4GscZssH0Ggj8/Ysh/ggAMxwirHd80Z702J11VIJGTbUYeBaqbvCKdwa7bvjI7llJIsjGnHpyOF0qzxCCNJg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9939
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 26 Oct 2023 07:51:29 -0700 (PDT)

Add support for multiple BISes in broadcast source and sink

---
 client/player.c | 57 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/client/player.c b/client/player.c
index 715598aa9..bf0338dfb 100644
--- a/client/player.c
+++ b/client/player.c
@@ -118,16 +118,16 @@ struct transport {
 	struct io *timer_io;
 };
 
-static const uint8_t base_lc3_16_2_1[] = {
+static const uint8_t base_lc3_48_4_1[] = {
 	0x28, 0x00, 0x00, /* Presentation Delay */
 	0x01, /* Number of Subgroups */
 	0x01, /* Number of BIS */
 	0x06, 0x00, 0x00, 0x00, 0x00, /* Code ID = LC3 (0x06) */
 	0x10, /* Codec Specific Configuration */
-	0x02, 0x01, 0x03, /* 16 KHZ */
+	0x02, 0x01, 0x08, /* 48 KHZ */
 	0x02, 0x02, 0x01, /* 10 ms */
-	0x05, 0x03, 0x01, 0x00, 0x00, 0x00,  /* Front Left */
-	0x03, 0x04, 0x28, 0x00, /* Frame Length 40 bytes */
+	0x05, 0x03, 0x03, 0x00, 0x00, 0x00,  /* Front Left, Front Right */
+	0x03, 0x04, 0x78, 0x00, /* Frame Length 120 bytes */
 	0x04, /* Metadata */
 	0x03, 0x02, 0x02, 0x00, /* Audio Context: Convertional */
 	0x01, /* BIS */
@@ -2999,7 +2999,45 @@ static void endpoint_config(const char *input, void *user_data)
 	endpoint_set_config(cfg);
 }
 
+static void config_endpoint_iso_stream(const char *input, void *user_data)
+{
+	struct endpoint_config *cfg = user_data;
+	char *endptr = NULL;
+	int value;
+
+	value = strtol(input, &endptr, 0);
+
+	if (!endptr || *endptr != '\0' || value > UINT8_MAX) {
+		bt_shell_printf("Invalid argument: %s\n", input);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	bcast_qos.bcast.bis = value;
+
+	endpoint_set_config(cfg);
+}
+
+static void config_endpoint_iso_group(const char *input, void *user_data)
+{
+	struct endpoint_config *cfg = user_data;
+	char *endptr = NULL;
+	int value;
+
+	value = strtol(input, &endptr, 0);
+
+	if (!endptr || *endptr != '\0' || value > UINT8_MAX) {
+		bt_shell_printf("Invalid argument: %s\n", input);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	bcast_qos.bcast.big = value;
+
+	bt_shell_prompt_input(cfg->ep->path, "BIS (value):",
+			config_endpoint_iso_stream, cfg);
+}
+
 static struct endpoint *endpoint_new(const struct capabilities *cap);
+static void endpoint_init_defaults(struct endpoint *ep);
 
 static void cmd_config_endpoint(int argc, char *argv[])
 {
@@ -3033,6 +3071,7 @@ static void cmd_config_endpoint(int argc, char *argv[])
 		if (cap) {
 			broadcast = true;
 			cfg->ep = endpoint_new(cap);
+			endpoint_init_defaults(cfg->ep);
 			cfg->ep->preset = find_presets_name(uuid, argv[3]);
 			if (!cfg->ep->preset)
 				bt_shell_printf("Preset not found\n");
@@ -3057,8 +3096,8 @@ static void cmd_config_endpoint(int argc, char *argv[])
 			iov_append(&cfg->ep->bcode, bcast_qos.bcast.bcode,
 				sizeof(bcast_qos.bcast.bcode));
 			/* Copy capabilities for broadcast*/
-			iov_append(&cfg->caps, base_lc3_16_2_1,
-				sizeof(base_lc3_16_2_1));
+			iov_append(&cfg->caps, base_lc3_48_4_1,
+				sizeof(base_lc3_48_4_1));
 		} else {
 			/* Copy capabilities */
 			iov_append(&cfg->caps, preset->data.iov_base,
@@ -3068,7 +3107,11 @@ static void cmd_config_endpoint(int argc, char *argv[])
 		/* Set QoS parameters */
 		cfg->qos = &preset->qos;
 
-		endpoint_set_config(cfg);
+		if (cfg->ep->broadcast)
+			bt_shell_prompt_input(cfg->ep->path, "BIG (value):",
+					config_endpoint_iso_group, cfg);
+		else
+			endpoint_set_config(cfg);
 		return;
 	}
 
-- 
2.39.2