Skip to content

Commit

Permalink
google_audio_processing: Clean up MOCK kconfig
Browse files Browse the repository at this point in the history
The mock facility for AEC got folded into CONFIG_STUBS which is a more
general tunable.  But it was done with a kconfig "select" and not a
default, which meant that it was no longer possible to disable the
mock when AEC was enabled without changing COMP_STUBS globally, which
hurts debugging.  Put the handling in a default on the variable
instead, now it can be overridden by later stages of kconfig (like the
board conf file or the command line of xtensa-build-zephyr.py).

Also enable MOCK explicitly in two spots (library build_all_ipc3)
where AEC was being built out of the SOF upstream code alone and was
relying on MOCK=y being automatically selected.  That doesn't build
anymore, the default is to build the real feature.

Signed-off-by: Andy Ross <[email protected]>
  • Loading branch information
andyross committed Dec 13, 2023
1 parent d57dfeb commit 10a5e92
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions app/stub_build_all_ipc3.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CONFIG_COMP_STUBS=y
CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y
CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
CONFIG_COMP_TONE=n
CONFIG_COMP_CROSSOVER=y
CONFIG_COMP_DRC=y
Expand Down
1 change: 1 addition & 0 deletions src/arch/host/configs/library_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CONFIG_COMP_DCBLOCK=y
CONFIG_COMP_DRC=y
CONFIG_COMP_FIR=y
CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y
CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
CONFIG_COMP_IIR=y
CONFIG_COMP_MFCC=y
CONFIG_COMP_MODULE_ADAPTER=y
Expand Down
3 changes: 1 addition & 2 deletions src/audio/google/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ config COMP_GOOGLE_HOTWORD_DETECT
config COMP_GOOGLE_RTC_AUDIO_PROCESSING
bool "Google Real Time Communication Audio processing"
select COMP_BLOB
select GOOGLE_RTC_AUDIO_PROCESSING_MOCK if COMP_STUBS
default n
help
Select for Google real-time communication audio processing. It
Expand Down Expand Up @@ -75,7 +74,7 @@ config COMP_GOOGLE_RTC_AUDIO_PROCESSING_MIC_HEADROOM_LINEAR

config GOOGLE_RTC_AUDIO_PROCESSING_MOCK
bool "Google Real Time Communication Audio processing mock"
default n
default y if COMP_STUBS
depends on COMP_GOOGLE_RTC_AUDIO_PROCESSING
help
Mock Google real-time communication audio processing.
Expand Down

0 comments on commit 10a5e92

Please sign in to comment.