diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index c594f806c4b4..b5d61b586c84 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -4,7 +4,6 @@ CONFIG_IPC4_BASE_FW_INTEL=y CONFIG_COMP_SRC=y CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y -CONFIG_COMP_SRC_LITE=y CONFIG_COMP_DRC=y CONFIG_COMP_CROSSOVER=y CONFIG_COMP_MULTIBAND_DRC=y diff --git a/src/audio/src/Kconfig b/src/audio/src/Kconfig index 1c0e24af15a3..e21b05666e4a 100644 --- a/src/audio/src/Kconfig +++ b/src/audio/src/Kconfig @@ -6,17 +6,6 @@ config COMP_SRC help Select for SRC component -config COMP_SRC_LITE - bool "SRC_LITE component" - default y - help - Select for SRC_LITE component - which only supports a subset of conversions - supported by the SRC module: - 48 -> 16kHz - 44.1 -> 16 kHz - 32 -> 16 kHz - 44.1 -> 48 if COMP_SRC choice @@ -63,6 +52,17 @@ config COMP_SRC_IPC4_FULL_MATRIX storate consumes 241 kB. The runtime needs 9 kB. Use this to make the full conversions set available for IPC4 build. +config COMP_SRC_LITE + bool "SRC_LITE component" + help + Select for SRC_LITE component + which only supports a subset of conversions + supported by the SRC module: + 48 -> 16kHz + 44.1 -> 16 kHz + 32 -> 16 kHz + 44.1 -> 48 + endchoice endif # SRC diff --git a/src/audio/src/src.c b/src/audio/src/src.c index 8c88ac57c908..cb65455e11a1 100644 --- a/src/audio/src/src.c +++ b/src/audio/src/src.c @@ -41,7 +41,7 @@ #include "src.h" #include "src_config.h" -#ifdef SRC_LITE +#if CONFIG_COMP_SRC_LITE #include "coef/src_lite_ipc4_int32_define.h" #include "coef/src_lite_ipc4_int32_table.h" #elif SRC_SHORT || CONFIG_COMP_SRC_TINY @@ -703,5 +703,10 @@ static const struct module_interface src_interface = { .free = src_free, }; +#if CONFIG_COMP_SRC_LITE +DECLARE_SOF_RT_UUID("src_lite", src_uuid, 0x33441051, 0x44CD, 0x466A, + 0x83, 0xA3, 0x17, 0x84, 0x78, 0x70, 0x8A, 0xEA); +#endif + DECLARE_MODULE_ADAPTER(src_interface, src_uuid, src_tr); SOF_MODULE_INIT(src, sys_comp_module_src_interface_init); diff --git a/src/audio/src/src_ipc3.c b/src/audio/src/src_ipc3.c index ad1f1ed05a36..a3633658b64c 100644 --- a/src/audio/src/src_ipc3.c +++ b/src/audio/src/src_ipc3.c @@ -41,9 +41,11 @@ #include "src.h" #include "src_config.h" +#if !CONFIG_COMP_SRC_LITE /* c1c5326d-8390-46b4-aa47-95c3beca6550 */ DECLARE_SOF_RT_UUID("src", src_uuid, 0xc1c5326d, 0x8390, 0x46b4, 0xaa, 0x47, 0x95, 0xc3, 0xbe, 0xca, 0x65, 0x50); +#endif DECLARE_TR_CTX(src_tr, SOF_UUID(src_uuid), LOG_LEVEL_INFO); diff --git a/src/audio/src/src_ipc4.c b/src/audio/src/src_ipc4.c index 74e1cd03fd7b..f57814c51fc1 100644 --- a/src/audio/src/src_ipc4.c +++ b/src/audio/src/src_ipc4.c @@ -41,9 +41,11 @@ #include "src.h" #include "src_config.h" +#if !CONFIG_COMP_SRC_LITE /* e61bb28d-149a-4c1f-b709-46823ef5f5a3 */ DECLARE_SOF_RT_UUID("src", src_uuid, 0xe61bb28d, 0x149a, 0x4c1f, 0xb7, 0x09, 0x46, 0x82, 0x3e, 0xf5, 0xf5, 0xae); +#endif DECLARE_TR_CTX(src_tr, SOF_UUID(src_uuid), LOG_LEVEL_INFO); diff --git a/src/audio/src/src_lite.c b/src/audio/src/src_lite.c deleted file mode 100644 index 5b6bf40f832a..000000000000 --- a/src/audio/src/src_lite.c +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -// -// Copyright(c) 2023 Intel Corporation. All rights reserved. -// -// Author: Fabiola Jasinska - -#include -#include "src.h" -#include "src_config.h" - -#define SRC_LITE 1 - -LOG_MODULE_REGISTER(src_lite, CONFIG_SOF_LOG_LEVEL); - -static const struct module_interface src_lite_interface = { - .init = src_init, - .prepare = src_prepare, - .process = src_process, - .is_ready_to_process = src_is_ready_to_process, - .set_configuration = src_set_config, - .get_configuration = src_get_config, - .reset = src_reset, - .free = src_free, -}; - -DECLARE_SOF_RT_UUID("src_lite", src_lite_uuid, 0x33441051, 0x44CD, 0x466A, - 0x83, 0xA3, 0x17, 0x84, 0x78, 0x70, 0x8A, 0xEA); - -DECLARE_TR_CTX(src_lite_tr, SOF_UUID(src_lite_uuid), LOG_LEVEL_INFO); - -DECLARE_MODULE_ADAPTER(src_lite_interface, src_lite_uuid, src_lite_tr); -SOF_MODULE_INIT(src_lite, sys_comp_module_src_lite_interface_init); diff --git a/tools/rimage/config/lnl.toml.h b/tools/rimage/config/lnl.toml.h index ce43c5595307..93712d14a5dc 100644 --- a/tools/rimage/config/lnl.toml.h +++ b/tools/rimage/config/lnl.toml.h @@ -44,7 +44,9 @@ #include