Skip to content
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.

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

Audio: Volume: Add bypass functions #7828

Merged
merged 2 commits into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 2 additions & 0 deletions src/audio/module_adapter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ if((NOT CONFIG_LIBRARY) OR CONFIG_LIBRARY_STATIC)
add_local_sources(sof
module/volume/volume_generic.c
module/volume/volume_hifi3.c
module/volume/volume_hifi4.c
module/volume/volume_generic_with_peakvol.c
module/volume/volume_hifi3_with_peakvol.c
module/volume/volume_hifi4_with_peakvol.c
module/volume/volume.c)
endif()

Expand Down
2 changes: 1 addition & 1 deletion src/audio/module_adapter/module/volume/volume_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ LOG_MODULE_DECLARE(volume_generic, CONFIG_SOF_LOG_LEVEL);

#include <sof/audio/volume.h>

#ifdef CONFIG_GENERIC
#ifdef VOLUME_GENERIC

#if (!CONFIG_COMP_PEAK_VOL)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(volume_generic, CONFIG_SOF_LOG_LEVEL);

#include <sof/audio/volume.h>

#ifdef CONFIG_GENERIC
#ifdef VOLUME_GENERIC

#if CONFIG_COMP_PEAK_VOL

Expand Down
6 changes: 4 additions & 2 deletions src/audio/module_adapter/module/volume/volume_hifi3.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ LOG_MODULE_DECLARE(volume_hifi3, CONFIG_SOF_LOG_LEVEL);

#include <sof/audio/volume.h>

#if defined(__XCC__) && XCHAL_HAVE_HIFI3 && (!CONFIG_COMP_PEAK_VOL)
#ifdef VOLUME_HIFI3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we could make these Kconfig options, we could select in CMakeLists.txt which files to build


#if (!CONFIG_COMP_PEAK_VOL)

#include <xtensa/tie/xt_hifi3.h>

Expand Down Expand Up @@ -337,5 +339,5 @@ const struct comp_func_map volume_func_map[] = {
};

const size_t volume_func_count = ARRAY_SIZE(volume_func_map);

#endif
#endif
Loading