Skip to content

Commit

Permalink
google_aec: Clean up kconfig handling
Browse files Browse the repository at this point in the history
Put the AEC tunables inside an if COMP_GOOGLE_RTC_AUDIO_PROCESSING for
hygine.  This prevents them from appearing in .config files of SOF
builds where AEC was never enabled at all.

Set MOCK via a default instead of select.  Select is unoverridable, it
forces the MOCK to be used whenever COMP_STUBS=y, but it's more
flexible to allow the app to pick and choose which components get
stubbed (STUBS is often set at the platform layer).

Signed-off-by: Andy Ross <[email protected]>
  • Loading branch information
andyross committed Jun 18, 2024
1 parent 722a17b commit 47e61c6
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 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 All @@ -24,6 +23,8 @@ config COMP_GOOGLE_RTC_AUDIO_PROCESSING
This component takes raw microphones input and playback reference
and outputs an echo-free microphone signal.

if COMP_GOOGLE_RTC_AUDIO_PROCESSING

config COMP_GOOGLE_RTC_AUDIO_PROCESSING_SAMPLE_RATE_HZ
depends on COMP_GOOGLE_RTC_AUDIO_PROCESSING
int "Sample rate for Google Real Time Communication Audio processing"
Expand Down Expand Up @@ -79,10 +80,12 @@ 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.
It allows for compilation check and basic audio flow checking.

endif # COMP_GOOGLE_RTC_AUDIO_PROCESSING

endmenu

0 comments on commit 47e61c6

Please sign in to comment.