audio: bt: add high-quality audio format presets, dynamic kcontrol, and shell format selector

Author: lrgirdwo

src/audio/bt_audio.c

@@ -191,10 +191,13 @@ static struct comp_dev *bt_audio_new(const struct comp_driver *drv,
 
 	dev->ipc_config = *config;
 
-	bad = rzalloc(SOF_MEM_FLAG_KERNEL, sizeof(*bad));
-	if (!bad) {
-		rfree(dev);
-		return NULL;
+	/* Use static instances to avoid dynamic heap allocations */
+	if (config->pipeline_id == 1 || config->id == 15) {
+		bad = &s_bt_playback_inst;
+		g_bt_playback_data = bad;
+	} else {
+		bad = &s_bt_capture_inst;
+		g_bt_capture_data = bad;
 	}
 
 	comp_set_drvdata(dev, bad);
@@ -204,12 +207,6 @@ static struct comp_dev *bt_audio_new(const struct comp_driver *drv,
 	bad->frame_bytes = 4;
 	bad->period_bytes = (bad->sample_rate / 1000) * bad->frame_bytes;
 
-	if (config->pipeline_id == 1 || config->id == 15) {
-		g_bt_playback_data = bad;
-	} else {
-		g_bt_capture_data = bad;
-	}
-
 	dev->state = COMP_STATE_READY;
 	return dev;
 }
@@ -225,7 +222,7 @@ static void bt_audio_free(struct comp_dev *dev)
 		g_bt_capture_data = NULL;
 	}
 
-	rfree(bad);
+	/* bad points to static BSS instance, do not rfree */
 	rfree(dev);
 }
 

src/audio/bt_service.c

@@ -15,15 +15,110 @@
 LOG_MODULE_REGISTER(bt_service, CONFIG_SOF_LOG_LEVEL);
 
 #define ESP32P4_GPIO_C6_EN_BIT    (1U << 22) /* GPIO 54 = 32 + 22 */
-#define BT_AUDIO_FRAME_MS         10
-#define BT_AUDIO_FRAME_SAMPLES    480 /* 10ms at 48kHz */
-#define BT_AUDIO_FRAME_BYTES      (BT_AUDIO_FRAME_SAMPLES * 2 * sizeof(int16_t)) /* 1920 bytes */
+
+static const struct bt_audio_format_desc s_formats[BT_AUDIO_FMT_COUNT] = {
+	[BT_AUDIO_FMT_48K_STD] = {
+		.format = BT_AUDIO_FMT_48K_STD,
+		.name = "48k_std",
+		.codec_name = "LC3",
+		.sample_rate = 48000,
+		.bit_depth = 16,
+		.frame_duration_us = 10000,
+		.frame_duration_ms = 10,
+		.octets_per_codec_frame = 100,
+		.bitrate_kbps = 160,
+		.frame_samples = 480,
+		.frame_bytes = 1920,
+	},
+	[BT_AUDIO_FMT_48K_HQ] = {
+		.format = BT_AUDIO_FMT_48K_HQ,
+		.name = "48k_hq",
+		.codec_name = "LC3",
+		.sample_rate = 48000,
+		.bit_depth = 16,
+		.frame_duration_us = 10000,
+		.frame_duration_ms = 10,
+		.octets_per_codec_frame = 120,
+		.bitrate_kbps = 192,
+		.frame_samples = 480,
+		.frame_bytes = 1920,
+	},
+	[BT_AUDIO_FMT_48K_MAX] = {
+		.format = BT_AUDIO_FMT_48K_MAX,
+		.name = "48k_max",
+		.codec_name = "LC3",
+		.sample_rate = 48000,
+		.bit_depth = 24,
+		.frame_duration_us = 10000,
+		.frame_duration_ms = 10,
+		.octets_per_codec_frame = 240,
+		.bitrate_kbps = 384,
+		.frame_samples = 480,
+		.frame_bytes = 1920,
+	},
+	[BT_AUDIO_FMT_44K] = {
+		.format = BT_AUDIO_FMT_44K,
+		.name = "44k",
+		.codec_name = "LC3",
+		.sample_rate = 44100,
+		.bit_depth = 16,
+		.frame_duration_us = 10000,
+		.frame_duration_ms = 10,
+		.octets_per_codec_frame = 130,
+		.bitrate_kbps = 208,
+		.frame_samples = 441,
+		.frame_bytes = 1764,
+	},
+	[BT_AUDIO_FMT_48K_LL] = {
+		.format = BT_AUDIO_FMT_48K_LL,
+		.name = "48k_ll",
+		.codec_name = "LC3",
+		.sample_rate = 48000,
+		.bit_depth = 16,
+		.frame_duration_us = 7500,
+		.frame_duration_ms = 8,
+		.octets_per_codec_frame = 75,
+		.bitrate_kbps = 160,
+		.frame_samples = 360,
+		.frame_bytes = 1440,
+	},
+	[BT_AUDIO_FMT_96K_HR] = {
+		.format = BT_AUDIO_FMT_96K_HR,
+		.name = "96k_hr",
+		.codec_name = "LC3plus-HR",
+		.sample_rate = 96000,
+		.bit_depth = 24,
+		.frame_duration_us = 5000,
+		.frame_duration_ms = 5,
+		.octets_per_codec_frame = 160,
+		.bitrate_kbps = 512,
+		.frame_samples = 480,
+		.frame_bytes = 1920,
+	},
+	[BT_AUDIO_FMT_LPCM] = {
+		.format = BT_AUDIO_FMT_LPCM,
+		.name = "lpcm",
+		.codec_name = "LPCM (Raw)",
+		.sample_rate = 32000,
+		.bit_depth = 16,
+		.frame_duration_us = 10000,
+		.frame_duration_ms = 10,
+		.octets_per_codec_frame = 640,
+		.bitrate_kbps = 1024,
+		.frame_samples = 320,
+		.frame_bytes = 1280,
+	},
+};
 
 static struct bt_service_status s_status = {
 	.c6_powered = false,
 	.state = BT_STATE_DISABLED,
 	.route = SOF_AUDIO_ROUTE_USB_DAI,
+	.format = BT_AUDIO_FMT_48K_STD,
 	.sample_rate = 48000,
+	.bitrate_kbps = 160,
+	.frame_bytes = 1920,
+	.codec_name = "LC3",
 	.tx_packets = 0,
 	.rx_packets = 0,
 	.tx_bytes = 0,
@@ -61,8 +156,10 @@ int bt_service_start_broadcast(void)
 		k_msleep(150);
 	}
 
+	const struct bt_audio_format_desc *desc = &s_formats[s_status.format];
 	s_status.state = BT_STATE_BROADCASTING;
-	LOG_INF("Bluetooth LE Audio Broadcast started at %u Hz stereo (10ms ISO SDU)", s_status.sample_rate);
+	LOG_INF("Bluetooth LE Audio Broadcast started: '%s' (%s @ %u Hz, %u kbps, %u ms SDU)",
+		desc->name, desc->codec_name, desc->sample_rate, desc->bitrate_kbps, desc->frame_duration_ms);
 	return 0;
 }
 
@@ -102,6 +199,62 @@ enum sof_audio_route bt_service_get_route(void)
 	return s_status.route;
 }
 
+int bt_service_set_format(enum bt_audio_format fmt)
+{
+	if (fmt >= BT_AUDIO_FMT_COUNT) {
+		LOG_ERR("Invalid Bluetooth audio format: %d", fmt);
+		return -EINVAL;
+	}
+
+	const struct bt_audio_format_desc *desc = &s_formats[fmt];
+	s_status.format = fmt;
+	s_status.sample_rate = desc->sample_rate;
+	s_status.bitrate_kbps = desc->bitrate_kbps;
+	s_status.frame_bytes = desc->frame_bytes;
+	s_status.codec_name = desc->codec_name;
+
+	bt_audio_set_playback_rate(desc->sample_rate);
+	bt_audio_set_capture_rate(desc->sample_rate);
+
+	LOG_INF("Bluetooth audio format set to '%s' (%s @ %u Hz %u-bit, %u kbps, %u ms SDU, %u B PCM)",
+		desc->name, desc->codec_name, desc->sample_rate, desc->bit_depth,
+		desc->bitrate_kbps, desc->frame_duration_ms, desc->frame_bytes);
+	return 0;
+}
+
+enum bt_audio_format bt_service_get_format(void)
+{
+	return s_status.format;
+}
+
+const struct bt_audio_format_desc *bt_service_get_format_desc(enum bt_audio_format fmt)
+{
+	if (fmt >= BT_AUDIO_FMT_COUNT) {
+		return NULL;
+	}
+	return &s_formats[fmt];
+}
+
+const struct bt_audio_format_desc *bt_service_get_current_format_desc(void)
+{
+	return &s_formats[s_status.format];
+}
+
+int bt_service_format_from_name(const char *name, enum bt_audio_format *fmt)
+{
+	if (!name || !fmt) {
+		return -EINVAL;
+	}
+
+	for (int i = 0; i < BT_AUDIO_FMT_COUNT; i++) {
+		if (strcmp(name, s_formats[i].name) == 0) {
+			*fmt = (enum bt_audio_format)i;
+			return 0;
+		}
+	}
+	return -ENOENT;
+}
+
 void bt_service_get_status(struct bt_service_status *status)
 {
 	if (status) {
@@ -116,12 +269,16 @@ static void bt_audio_stream_task(void *p1, void *p2, void *p3)
 	ARG_UNUSED(p2);
 	ARG_UNUSED(p3);
 
-	static uint8_t s_audio_buf[BT_AUDIO_FRAME_BYTES] __aligned(4);
+	static uint8_t s_audio_buf[1920] __aligned(4);
 
 	while (s_thread_running) {
+		const struct bt_audio_format_desc *desc = &s_formats[s_status.format];
+		uint32_t frame_bytes = desc->frame_bytes;
+		uint32_t sleep_ms = desc->frame_duration_ms ? desc->frame_duration_ms : 10;
+
 		if (s_status.state == BT_STATE_BROADCASTING) {
 			/* Fetch audio from pipeline/bt_audio component */
-			size_t fetched = bt_audio_fetch_capture_data(s_audio_buf, BT_AUDIO_FRAME_BYTES);
+			size_t fetched = bt_audio_fetch_capture_data(s_audio_buf, frame_bytes);
 			if (fetched > 0) {
 				s_status.tx_packets++;
 				s_status.tx_bytes += fetched;
@@ -135,10 +292,10 @@ static void bt_audio_stream_task(void *p1, void *p2, void *p3)
 			}
 		} else if (s_status.state == BT_STATE_RECEIVING) {
 			s_status.rx_packets++;
-			s_status.rx_bytes += BT_AUDIO_FRAME_BYTES;
+			s_status.rx_bytes += frame_bytes;
 		}
 
-		k_msleep(BT_AUDIO_FRAME_MS);
+		k_msleep(sleep_ms);
 	}
 }
 

src/audio/pipeline/static_pipeline_loader.c

@@ -5,6 +5,7 @@
 
 #include <sof/audio/pipeline/static_pipeline.h>
 #include <sof/audio/pipeline/sof_static_pipeline.h>
+#include <sof/audio/bt_service.h>
 #include <sof/audio/component_ext.h>
 #include <sof/audio/pipeline.h>
 #include <sof/audio/buffer.h>
@@ -544,6 +545,12 @@ int sof_static_kcontrol_set(uint32_t ctrl_id, int32_t val)
 		return sof_static_pipeline_set_route((enum sof_audio_route)val);
 	}
 
+	if (ctl->id == 14 || (ctl->name && !strcmp(ctl->name, "BT Audio Format"))) {
+		s_control_vals[ctl_idx] = val;
+		LOG_INF("Kcontrol [%u] '%s' set to %d", ctl->id, ctl->name, val);
+		return bt_service_set_format((enum bt_audio_format)val);
+	}
+
 	struct comp_dev *dev = sof_static_comp_get(ctl->target_comp_id);
 	if (!dev)
 		return -ENODEV;

src/debug/shell/esp32_shell.c

@@ -364,6 +364,7 @@ static int cmd_sof_bt_status(const struct shell *sh, size_t argc, char **argv)
 
 	struct bt_service_status st;
 	bt_service_get_status(&st);
+	const struct bt_audio_format_desc *desc = bt_service_get_current_format_desc();
 
 	shell_print(sh, "=== Bluetooth LE Audio / C6 Co-Processor Status ===");
 	shell_print(sh, "  ESP32-C6 Power:    %s (GPIO 54 asserted)", st.c6_powered ? "ON" : "OFF");
@@ -372,14 +373,57 @@ static int cmd_sof_bt_status(const struct shell *sh, size_t argc, char **argv)
 		    (st.state == BT_STATE_READY ? "READY" :
 		    (st.state == BT_STATE_BROADCASTING ? "BROADCASTING" :
 		    (st.state == BT_STATE_RECEIVING ? "RECEIVING" : "SCANNING"))));
-	shell_print(sh, "  Profile / Codec:   BAP Broadcast / LC3 @ %u Hz 2ch (10ms ISO SDU)", st.sample_rate);
+	shell_print(sh, "  Active Format:     %s (%s)", desc ? desc->name : "unknown", desc ? desc->codec_name : "LC3");
+	shell_print(sh, "  Audio Quality:     %u Hz, %u-bit stereo, %u kbps (%u.%u ms SDU, %u B PCM)",
+		    st.sample_rate, desc ? desc->bit_depth : 16, st.bitrate_kbps,
+		    desc ? (desc->frame_duration_us / 1000) : 10,
+		    desc ? ((desc->frame_duration_us % 1000) / 100) : 0,
+		    st.frame_bytes);
 	shell_print(sh, "  TX Packets / Bytes:%u pkts / %u bytes", st.tx_packets, st.tx_bytes);
 	shell_print(sh, "  RX Packets / Bytes:%u pkts / %u bytes", st.rx_packets, st.rx_bytes);
 	shell_print(sh, "  Link RSSI:         %d dBm", st.rssi);
 	shell_print(sh, "====================================================");
 	return 0;
 }
 
+static int cmd_sof_bt_format(const struct shell *sh, size_t argc, char **argv)
+{
+	if (argc < 2) {
+		enum bt_audio_format current = bt_service_get_format();
+		shell_print(sh, "=== Available Bluetooth Audio Formats ===");
+		shell_print(sh, "  ID | Format Key | Codec      | Sample Rate | Bits | Frame | Bitrate  | Frame PCM");
+		shell_print(sh, "-----+------------+------------+-------------+------+-------+----------+----------");
+		for (int i = 0; i < BT_AUDIO_FMT_COUNT; i++) {
+			const struct bt_audio_format_desc *d = bt_service_get_format_desc((enum bt_audio_format)i);
+			if (!d) continue;
+			char cur_mark = (i == (int)current) ? '*' : ' ';
+			shell_print(sh, " %c%d | %-10s | %-10s | %6u Hz   | %2u   | %2u.%1u ms| %4u kbps| %5u B",
+				    cur_mark, i, d->name, d->codec_name, d->sample_rate, d->bit_depth,
+				    d->frame_duration_us / 1000, (d->frame_duration_us % 1000) / 100,
+				    d->bitrate_kbps, d->frame_bytes);
+		}
+		shell_print(sh, "=========================================");
+		shell_print(sh, "Usage: sof bt format <name|id>");
+		return 0;
+	}
+
+	enum bt_audio_format target_fmt;
+	char *endptr;
+	long val = strtol(argv[1], &endptr, 10);
+	if (*endptr == '\0' && val >= 0 && val < BT_AUDIO_FMT_COUNT) {
+		target_fmt = (enum bt_audio_format)val;
+	} else if (bt_service_format_from_name(argv[1], &target_fmt) != 0) {
+		shell_error(sh, "Unknown format: %s. Run 'sof bt format' to see available formats.", argv[1]);
+		return -EINVAL;
+	}
+
+	sof_static_kcontrol_set(14, (int32_t)target_fmt);
+	const struct bt_audio_format_desc *desc = bt_service_get_format_desc(target_fmt);
+	shell_print(sh, "Bluetooth audio format switched to: %s (%s @ %u Hz, %u kbps)",
+		    desc->name, desc->codec_name, desc->sample_rate, desc->bitrate_kbps);
+	return 0;
+}
+
 static int cmd_sof_bt_broadcast(const struct shell *sh, size_t argc, char **argv)
 {
 	if (argc < 2) {
@@ -456,6 +500,7 @@ static int cmd_sof_route(const struct shell *sh, size_t argc, char **argv)
 
 SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
 	SHELL_CMD(status, NULL, "Print Bluetooth LE Audio / C6 coprocessor status", cmd_sof_bt_status),
+	SHELL_CMD(format, NULL, "Get or set BT audio format (sof bt format [name|id])", cmd_sof_bt_format),
 	SHELL_CMD(broadcast, NULL, "Start/stop LE Audio broadcast (sof bt broadcast <start|stop>)", cmd_sof_bt_broadcast),
 	SHELL_CMD(scan, NULL, "Scan for nearby LE Audio devices", cmd_sof_bt_scan),
 	SHELL_CMD(power, NULL, "Control ESP32-C6 power (sof bt power <on|off>)", cmd_sof_bt_power),