applications: nrf5340_audio: Audio module integration example

Implement the LC3 audio decoder as an example module with in the audio application. Signed-off-by: Graham Wacey <[email protected]>
gWacey · Jul 18, 2024 · 49e0535 · 49e0535
1 parent 7e65ab0
commit 49e0535
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/subsys/audio_modules/lc3/t2/decoder/Kconfig b/subsys/audio_modules/lc3/t2/decoder/Kconfig
@@ -128,8 +128,8 @@ config LC3_DECODER_THREAD_PRIO
 
 config LC3_DECODER_STACK_SIZE
 	int "Stack size for the decoder thread"
-	default 11000 if LC3_DECODER_BIT_DEPTH_16
-	default 21400 if LC3_DECODER_BIT_DEPTH_32
+	default 4092 if LC3_DECODER_BIT_DEPTH_16
+	default 5115 if LC3_DECODER_BIT_DEPTH_32
 	help
 	  The modules thread stack size.
 

diff --git a/tests/subsys/audio_modules/lc3_module/src/decoder_test.c b/tests/subsys/audio_modules/lc3_module/src/decoder_test.c
@@ -18,18 +18,10 @@
 
 #define TEST_LC3_DECODER_MSG_QUEUE_SIZE	      (4)
 #define TEST_LC3_DECODER_DATA_OBJECTS_NUM     (2)
-#define TEST_LC3_DECODER_STACK_SIZE	      (4192)
-#define TEST_LC3_DECODER_THREAD_PRIORITY      (4)
 #define TEST_LC3_DECODER_MODULES_NUM	      (TEST_AUDIO_CHANNELS_MAX)
 #define TEST_LC3_DECODER_MSG_SIZE	      (sizeof(struct audio_module_message))
 #define TEST_LC3_DECODER_AUDIO_DATA_ITEMS_NUM (4)
 
-enum test_module_id {
-	TEST_MODULE_LC3_DECODER = 0,
-	TEST_MODULE_LC3_ENCODER,
-	TEST_MODULES_NUM
-};
-
 enum test_lc3_decoder_module_id {
 	TEST_MODULE_ID_DECODER_1 = 0,
 	TEST_MODULE_ID_DECODER_2,
@@ -40,7 +32,7 @@ struct audio_module_handle handle[TEST_LC3_DECODER_MODULES_NUM];
 struct lc3_decoder_context decoder_ctx[TEST_LC3_DECODER_MODULES_NUM];
 
 K_THREAD_STACK_ARRAY_DEFINE(lc3_dec_thread_stack, TEST_LC3_DECODER_MODULES_NUM,
-			    TEST_LC3_DECODER_STACK_SIZE);
+			    CONFIG_LC3_DECODER_STACK_SIZE);
 DATA_FIFO_DEFINE(msg_fifo_tx, TEST_LC3_DECODER_MSG_QUEUE_SIZE, TEST_LC3_DECODER_MSG_SIZE);
 DATA_FIFO_DEFINE(msg_fifo_rx, TEST_LC3_DECODER_MSG_QUEUE_SIZE, TEST_LC3_DECODER_MSG_SIZE);
 DATA_FIFO_DEFINE(msg_fifo_tx1, TEST_LC3_DECODER_MSG_QUEUE_SIZE, TEST_LC3_DECODER_MSG_SIZE);
@@ -171,8 +163,8 @@ static void test_lc3_decoder_mono_multi_init(uint32_t locations)
 		data_fifo_init(msg_fifo_tx_array[i]);
 
 		test_decoder_param.description = lc3_decoder_description;
-		test_decoder_param.thread.stack_size = TEST_LC3_DECODER_STACK_SIZE;
-		test_decoder_param.thread.priority = TEST_LC3_DECODER_THREAD_PRIORITY;
+		test_decoder_param.thread.stack_size = CONFIG_LC3_DECODER_STACK_SIZE;
+		test_decoder_param.thread.priority = CONFIG_LC3_DECODER_THREAD_PRIO;
 		test_decoder_param.thread.data_slab = &audio_data_slab;
 		test_decoder_param.thread.data_size = TEST_DEC_MONO_BUF_SIZE;
 		test_decoder_param.thread.stack = lc3_dec_thread_stack[i],
@@ -235,8 +227,8 @@ static void test_lc3_decoder_multi_init(bool pcm_format, uint32_t locations)
 	data_fifo_init(msg_fifo_rx_array[0]);
 
 	test_decoder_param.description = lc3_decoder_description;
-	test_decoder_param.thread.stack_size = TEST_LC3_DECODER_STACK_SIZE;
-	test_decoder_param.thread.priority = TEST_LC3_DECODER_THREAD_PRIORITY;
+	test_decoder_param.thread.stack_size = CONFIG_LC3_DECODER_STACK_SIZE;
+	test_decoder_param.thread.priority = CONFIG_LC3_DECODER_THREAD_PRIO;
 	test_decoder_param.thread.data_slab = &audio_data_slab;
 	test_decoder_param.thread.data_size = TEST_DEC_MONO_BUF_SIZE * number_channels;
 	test_decoder_param.thread.stack = lc3_dec_thread_stack[0],