Skip to content

Cherry-pick #10241 from main branch #10412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
checkupup wants to merge 1 commit into from
Closed

Cherry-pick #10241 from main branch #10412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/overlays/mtl/dax_overlay.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CONFIG_COMP_MODULE_ADAPTER=y
CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING=y
CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING_MOCK=n
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
1 change: 1 addition & 0 deletions src/arch/host/configs/library_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CONFIG_COMP_ARIA=y
CONFIG_COMP_ASRC=y
CONFIG_COMP_CROSSOVER=y
CONFIG_COMP_DCBLOCK=y
CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING=y
CONFIG_COMP_DRC=y
CONFIG_COMP_FIR=y
CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y
Expand Down
24 changes: 24 additions & 0 deletions src/audio/module_adapter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,21 @@ if(zephyr) ### Zephyr ###
zephyr_library_import(xa_mp3_enc ${CONFIG_CADENCE_CODEC_MP3_ENC_LIB})
endif()

if (CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING)
zephyr_library_sources(
module/dolby/dax.c
)
if (CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING_MOCK)
zephyr_library_sources(
module/dolby/dax_mock.c
)
else()
target_link_libraries(SOF INTERFACE m)
target_link_libraries(SOF INTERFACE c)
zephyr_library_import(dax_effect ${sof_top_dir}/third_party/lib/libdax.a)
endif()
endif()

zephyr_include_directories_ifdef(CONFIG_LIBRARY_MANAGER
${SOF_SRC_PATH}/include/sof/audio/module_adapter/iadk/
${SOF_SRC_PATH}/include/sof/audio/module_adapter/library/
Expand Down Expand Up @@ -112,6 +127,15 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)

endif()

if(CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING)
add_local_sources(sof module/dolby/dax.c)
if (CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING_MOCK)
add_local_sources(sof module/dolby/dax_mock.c)
else()
sof_add_static_library(dax_effect ${sof_top_dir}/third_party/lib/libdax.a)
endif()
endif()

if(CONFIG_PASSTHROUGH_CODEC)
add_local_sources(sof module/passthrough.c)
endif()
Expand Down
17 changes: 17 additions & 0 deletions src/audio/module_adapter/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,23 @@ if CADENCE_CODEC

endif # Cadence

config COMP_DOLBY_DAX_AUDIO_PROCESSING
bool "Dolby DAX audio processing component"
default n
help
Select to include Dolby DAX component. Dolby DAX component implements DAX API.
API definition together with pre-compiled library is shared by Dolby.
If library is not provided, COMP_DOLBY_DAX_AUDIO_PROCESSING_MOCK must be true,
then the input will be copied to the output.

config COMP_DOLBY_DAX_AUDIO_PROCESSING_MOCK
bool "Dolby DAX audio processing component mock"
default y if COMP_STUBS
depends on COMP_DOLBY_DAX_AUDIO_PROCESSING
help
Mock DAX audio processing. It allows for compilation check and basic audio
flow checking.

config PASSTHROUGH_CODEC
bool "Passthrough codec"
default n
Expand Down
Loading
Loading