From a02fcc58289733b43dc3d2c5186adf680952236f Mon Sep 17 00:00:00 2001 From: Joe Cheng Date: Mon, 24 Feb 2025 21:25:50 +0800 Subject: [PATCH 1/3] config : mt8196: add xtos/zephyr config overlay for DTS Add configs for DTS integration on MT8196 Signed-off-by: Joe Cheng --- app/overlays/mt8196/dts_overlay.conf | 3 +++ src/arch/xtensa/configs/override/mt8196_chrome_dts.config | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 app/overlays/mt8196/dts_overlay.conf create mode 100644 src/arch/xtensa/configs/override/mt8196_chrome_dts.config diff --git a/app/overlays/mt8196/dts_overlay.conf b/app/overlays/mt8196/dts_overlay.conf new file mode 100644 index 000000000000..0160eaea199a --- /dev/null +++ b/app/overlays/mt8196/dts_overlay.conf @@ -0,0 +1,3 @@ +CONFIG_COMP_IIR=y +CONFIG_COMP_MODULE_ADAPTER=y +CONFIG_DTS_CODEC=y diff --git a/src/arch/xtensa/configs/override/mt8196_chrome_dts.config b/src/arch/xtensa/configs/override/mt8196_chrome_dts.config new file mode 100644 index 000000000000..0160eaea199a --- /dev/null +++ b/src/arch/xtensa/configs/override/mt8196_chrome_dts.config @@ -0,0 +1,3 @@ +CONFIG_COMP_IIR=y +CONFIG_COMP_MODULE_ADAPTER=y +CONFIG_DTS_CODEC=y From de7c8a808fb5109f5d49a04ad1fefeb0de47f523 Mon Sep 17 00:00:00 2001 From: Joe Cheng Date: Mon, 24 Feb 2025 21:27:54 +0800 Subject: [PATCH 2/3] topology1 : enable DTS on MT8196 Enable DTS on MT8196 Signed-off-by: Joe Cheng --- tools/topology/topology1/CMakeLists.txt | 1 + tools/topology/topology1/sof-mt8196-mt6681.m4 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index 2d1e804ab651..af6b5dc63a35 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -100,6 +100,7 @@ set(TPLGS "sof-mt8188-mt6359\;sof-mt8188-waves\;-DWAVES=1" "sof-mt8196-mt6681\;sof-mt8196" "sof-mt8196-mt6681\;sof-mt8196-waves\;-DWAVES=1" + "sof-mt8196-mt6681\;sof-mt8196-dts\;-DDTS=`DTS'" "sof-acp-renoir\;sof-acp" "sof-rn-rt5682-rt1019\;sof-rn-rt5682-rt1019" diff --git a/tools/topology/topology1/sof-mt8196-mt6681.m4 b/tools/topology/topology1/sof-mt8196-mt6681.m4 index e52c8c84fa0e..fb8b6662314e 100644 --- a/tools/topology/topology1/sof-mt8196-mt6681.m4 +++ b/tools/topology/topology1/sof-mt8196-mt6681.m4 @@ -37,7 +37,7 @@ dnl time_domain, sched_comp) define(`ENDPOINT_NAME', `Speakers') # Low Latency playback pipeline 1 on PCM 16 using max 2 channels of s16le # Set 1000us deadline with priority 0 on core 0 -PIPELINE_PCM_ADD(ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-passthrough-playback.m4), +PIPELINE_PCM_ADD(ifdef(`DTS', sof/pipe-eq-iir-dts-codec-playback.m4, ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-passthrough-playback.m4)), 1, 0, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) @@ -46,7 +46,7 @@ undefine(`ENDPOINT_NAME') define(`ENDPOINT_NAME', `Headphones') # Low Latency playback pipeline 2 on PCM 17 using max 2 channels of s16le # Set 1000us deadline with priority 0 on core 0 -PIPELINE_PCM_ADD(ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-passthrough-playback.m4), +PIPELINE_PCM_ADD(ifdef(`DTS', sof/pipe-eq-iir-dts-codec-playback.m4, ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-passthrough-playback.m4)), 2, 1, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) From 226b6078aa34804645160dd80e2362c35abba81c Mon Sep 17 00:00:00 2001 From: Joe Cheng Date: Mon, 24 Feb 2025 22:08:58 +0800 Subject: [PATCH 3/3] codec : dts : add include directory DTS header files are in third_party/include/. Add include directory to avoid build fail. Signed-off-by: Joe Cheng --- src/audio/codec/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/audio/codec/CMakeLists.txt b/src/audio/codec/CMakeLists.txt index d32c421ad997..0d14dbd98221 100644 --- a/src/audio/codec/CMakeLists.txt +++ b/src/audio/codec/CMakeLists.txt @@ -8,5 +8,6 @@ if(CONFIG_DTS_CODEC) else() sof_add_static_library(DtsCodec ${SOF_ROOT_SOURCE_DIRECTORY}/third_party/lib/libdts-sof-interface-i32.a) + target_include_directories(sof PRIVATE ${CMAKE_SOURCE_DIR}/third_party/include) endif() endif()