LE Audio: BAP shell LC3 decode #68920

Thalley · 2024-02-13T09:20:52Z

kruithofa · 2024-04-04T06:42:03Z

subsys/bluetooth/audio/shell/bap.c

+	shell_print(ctx_shell,
+		    "Initializing the LC3 decoder with %u us duration and %u Hz frequency",
+		    sh_stream->lc3_frame_duration_us, sh_stream->lc3_freq_hz);
+	/* Create the encoder instance. This shall complete before stream_started() is called. */


Suggested change

/* Create the encoder instance. This shall complete before stream_started() is called. */

/* Create the decoder instance. This shall complete before stream_started() is called. */

kruithofa · 2024-04-04T06:42:32Z

subsys/bluetooth/audio/shell/bap.c

+						   sh_stream->lc3_freq_hz, 0, /* No resampling */
+						   &sh_stream->lc3_decoder_mem);
+	if (sh_stream->lc3_decoder == NULL) {
+		shell_error(ctx_shell, "Failed to setup LC3 encoder - wrong parameters?\n");


Suggested change

shell_error(ctx_shell, "Failed to setup LC3 encoder - wrong parameters?\n");

shell_error(ctx_shell, "Failed to setup LC3 decoder - wrong parameters?\n");

Whoops - Too much copy-paste :)

pin-zephyr · 2024-04-05T07:01:22Z

subsys/bluetooth/audio/shell/bap.c

+
+		if ((sh_stream->decoded_cnt % recv_stats_interval) == 0) {
+			shell_print(ctx_shell, "[%zu]: Performing PLC", sh_stream->decoded_cnt);
+		}


when data == NULL, should we continue to execute lc3_decode() ?

NULL will perform PLC

pin-zephyr · 2024-04-05T07:04:15Z

subsys/bluetooth/audio/shell/bap.c

+		    sh_stream->lc3_frame_duration_us, sh_stream->lc3_freq_hz);
+	/* Create the decoder instance. This shall complete before stream_started() is called. */
+	sh_stream->lc3_decoder = lc3_setup_decoder(sh_stream->lc3_frame_duration_us,
+						   sh_stream->lc3_freq_hz, 0, /* No resampling */


I am not sure if the bap shell intended for non-USB device?

if not only for non-USB device, the sameple rate should not always 0.

This PR does not touch USB, but only does decoding. My followup PRs add proper resampling for USB

pin-zephyr · 2024-04-05T07:45:53Z

subsys/bluetooth/audio/shell/bap.c

+
+#if defined(CONFIG_BT_BAP_BROADCAST_SINK)
+	struct shell_stream *sh_stream = shell_stream_from_bap_stream(stream);
+


how about sh_stream == NULL ?

shell_stream_from_bap_stream cannot return NULL, as it always returns an address.

pin-zephyr · 2024-04-05T07:47:45Z

subsys/bluetooth/audio/shell/bap.c

+
+		if (default_broadcast_sink.stream_cnt == 0) {
+			/* All streams in the broadcast sink has been terminated */
+			default_broadcast_sink.syncable = true;


why do we need to set default_broadcast_sink.syncable = true ?

Yeah that doesn't make any sense, especially since we are setting it to false just below.

Must have been a bad merge conflict resolution or something :o

ChangNice · 2024-04-07T02:53:02Z

subsys/bluetooth/audio/shell/bap.c

+				break;
+			}
+
+			frame_cnt += ret;


This may have a code error, the frame_cnt should not add itself, because the ret = frame_cnt + chan_cnt.

ChangNice · 2024-04-07T03:06:58Z

subsys/bluetooth/audio/shell/bap.c

+		for (uint8_t i = 0U; i < frame_blocks_per_sdu; i++) {
+			const int ret = decode_frame_block(buf, sh_stream, frame_cnt);
+
+			if (ret < 0) {


"ret" never have a chance could less than 0.

ChangNice · 2024-04-12T01:29:16Z

subsys/bluetooth/audio/shell/bap.c

+		frame_cnt++;
+	}
+
+	return frame_cnt;


This function should return how many channnel decode success in one frame block, rather than the total frame_cnt.

Ah, yes, good catch

Add support for decoding incoming LC3 data. At this point we only instantiate a single LC3 decoder, so only one frequency and duration is supported. To accomodate for the increased RAM usage, the number of unicast streams support have been decreased. Further more, the LC3 handling in the shell has overall been improved, also for encoding. Signed-off-by: Emil Gydesen <[email protected]>

Thalley force-pushed the bap_shell_lc3_decode branch 6 times, most recently from 39b9785 to fa5a15a Compare February 14, 2024 16:06

Thalley changed the title ~~LE AUdio: BAP shell LC3 decode~~ LE Audio: BAP shell LC3 decode Feb 26, 2024

Thalley force-pushed the bap_shell_lc3_decode branch 6 times, most recently from 738579a to 5eda773 Compare March 1, 2024 11:36

Thalley force-pushed the bap_shell_lc3_decode branch 4 times, most recently from ac3006d to 2413adc Compare March 11, 2024 09:12

Thalley marked this pull request as ready for review March 11, 2024 10:55

zephyrbot added area: Bluetooth area: Bluetooth Audio labels Mar 11, 2024

zephyrbot requested review from asbjornsabo, Casper-Bonde-Bose, fredrikdanebjer, jhedberg, kruithofa, larsgk, MariuszSkamra, pin-zephyr and sjanc March 11, 2024 10:56

zephyrbot assigned Thalley Mar 11, 2024

Thalley force-pushed the bap_shell_lc3_decode branch from 1920196 to 61d868a Compare March 13, 2024 21:48

kruithofa previously approved these changes Mar 14, 2024

View reviewed changes

Thalley dismissed kruithofa’s stale review via cd5b695 March 26, 2024 10:56

Thalley force-pushed the bap_shell_lc3_decode branch 3 times, most recently from b1f4980 to 5e32f4c Compare April 1, 2024 12:47

Thalley requested a review from kruithofa April 1, 2024 12:47

kruithofa requested changes Apr 4, 2024

View reviewed changes

Thalley force-pushed the bap_shell_lc3_decode branch from 5e32f4c to 47dab1c Compare April 4, 2024 09:28

Thalley requested a review from kruithofa April 4, 2024 09:29

kruithofa previously approved these changes Apr 4, 2024

View reviewed changes

pin-zephyr reviewed Apr 5, 2024

View reviewed changes

pin-zephyr requested changes Apr 5, 2024

View reviewed changes

Thalley dismissed kruithofa’s stale review via e8de570 April 5, 2024 08:20

Thalley force-pushed the bap_shell_lc3_decode branch from 47dab1c to e8de570 Compare April 5, 2024 08:20

Thalley requested review from pin-zephyr and kruithofa April 5, 2024 08:21

ChangNice reviewed Apr 7, 2024

View reviewed changes

Thalley force-pushed the bap_shell_lc3_decode branch from e8de570 to 842e220 Compare April 11, 2024 14:13

Thalley requested a review from ChangNice April 11, 2024 14:13

ChangNice reviewed Apr 12, 2024

View reviewed changes

Thalley force-pushed the bap_shell_lc3_decode branch from 842e220 to 2d51bce Compare April 12, 2024 07:34

Thalley requested a review from ChangNice April 12, 2024 07:34

ChangNice approved these changes Apr 12, 2024

View reviewed changes

kruithofa approved these changes Apr 15, 2024

View reviewed changes

pin-zephyr approved these changes Apr 16, 2024

View reviewed changes

aescolar merged commit b4eac67 into zephyrproject-rtos:main Apr 16, 2024
24 checks passed

Thalley deleted the bap_shell_lc3_decode branch April 16, 2024 08:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LE Audio: BAP shell LC3 decode #68920

LE Audio: BAP shell LC3 decode #68920

Thalley commented Feb 13, 2024

kruithofa Apr 4, 2024

kruithofa Apr 4, 2024

Thalley Apr 4, 2024

pin-zephyr Apr 5, 2024 •

edited

Loading

ChangNice Apr 7, 2024

pin-zephyr Apr 5, 2024

Thalley Apr 5, 2024

pin-zephyr Apr 5, 2024

Thalley Apr 5, 2024

pin-zephyr Apr 5, 2024

Thalley Apr 5, 2024

ChangNice Apr 7, 2024

ChangNice Apr 7, 2024

ChangNice Apr 12, 2024

Thalley Apr 12, 2024

	/* Create the encoder instance. This shall complete before stream_started() is called. */
	/* Create the decoder instance. This shall complete before stream_started() is called. */

	shell_error(ctx_shell, "Failed to setup LC3 encoder - wrong parameters?\n");
	shell_error(ctx_shell, "Failed to setup LC3 decoder - wrong parameters?\n");


		#if defined(CONFIG_BT_BAP_BROADCAST_SINK)
		struct shell_stream *sh_stream = shell_stream_from_bap_stream(stream);

LE Audio: BAP shell LC3 decode #68920

LE Audio: BAP shell LC3 decode #68920

Conversation

Thalley commented Feb 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pin-zephyr Apr 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pin-zephyr Apr 5, 2024 •

edited

Loading