Skip to content

Commit df86acd

Browse files
committed
Audio: Sound Dose: Add new component
This patch adds a new SOF component Sound Dose. The purpose is to calculate for audio playback MEL values (momentary sound exposure level) to provide to user space the data to compute the sound dose CSD as defined in EN 50332-3. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent 59e99d0 commit df86acd

27 files changed

+1006
-2
lines changed

app/boards/intel_adsp_ace15_mtpm.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1616
CONFIG_COMP_SRC_LITE=y
1717
CONFIG_COMP_MFCC=y
1818
CONFIG_COMP_MULTIBAND_DRC=y
19+
CONFIG_COMP_SOUND_DOSE=y
1920
CONFIG_COMP_UP_DOWN_MIXER=y
2021
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
2122
CONFIG_FORMAT_CONVERT_HIFI3=n

app/boards/intel_adsp_ace20_lnl.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ CONFIG_COMP_CHAIN_DMA=y
1111
CONFIG_COMP_DRC=m
1212
CONFIG_COMP_KPB=y
1313
CONFIG_COMP_TESTER=m
14+
CONFIG_COMP_SOUND_DOSE=y
1415
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1516
CONFIG_COMP_UP_DOWN_MIXER=y
1617
CONFIG_COMP_VOLUME_WINDOWS_FADE=y

app/boards/intel_adsp_ace30_ptl.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CONFIG_MM_DRV=y
1010
CONFIG_COMP_CHAIN_DMA=y
1111
CONFIG_COMP_KPB=y
1212
CONFIG_COMP_TESTER=m
13+
CONFIG_COMP_SOUND_DOSE=y
1314
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1415
CONFIG_COMP_UP_DOWN_MIXER=y
1516
CONFIG_COMP_VOLUME_WINDOWS_FADE=y

app/boards/intel_adsp_ace30_wcl.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CONFIG_MM_DRV=y
1010
CONFIG_COMP_CHAIN_DMA=y
1111
CONFIG_COMP_KPB=y
1212
CONFIG_COMP_TESTER=m
13+
CONFIG_COMP_SOUND_DOSE=y
1314
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1415
CONFIG_COMP_UP_DOWN_MIXER=y
1516
CONFIG_COMP_VOLUME_WINDOWS_FADE=y

app/boards/intel_adsp_cavs25.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CONFIG_COMP_CROSSOVER=y
1212
CONFIG_COMP_DRC=y
1313
CONFIG_COMP_MFCC=y
1414
CONFIG_COMP_MULTIBAND_DRC=y
15+
CONFIG_COMP_SOUND_DOSE=y
1516
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
1617
CONFIG_FORMAT_CONVERT_HIFI3=n
1718
CONFIG_PCM_CONVERTER_FORMAT_S16LE=y

app/boards/intel_adsp_cavs25_tgph.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CONFIG_COMP_CROSSOVER=y
1212
CONFIG_COMP_DRC=y
1313
CONFIG_COMP_MFCC=y
1414
CONFIG_COMP_MULTIBAND_DRC=y
15+
CONFIG_COMP_SOUND_DOSE=y
1516
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
1617
CONFIG_FORMAT_CONVERT_HIFI3=n
1718
CONFIG_PCM_CONVERTER_FORMAT_S16LE=y

src/arch/host/configs/library_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CONFIG_COMP_MULTIBAND_DRC=y
1414
CONFIG_COMP_MUX=y
1515
CONFIG_COMP_RTNR=y
1616
CONFIG_COMP_SEL=y
17+
CONFIG_COMP_SOUND_DOSE=y
1718
CONFIG_COMP_SRC=y
1819
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1920
CONFIG_COMP_STUBS=y

src/audio/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
120120
list(APPEND base_files host-legacy.c)
121121
sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-legacy.c)
122122
endif()
123+
if(CONFIG_COMP_SOUND_DOSE)
124+
add_subdirectory(sound_dose)
125+
endif()
123126
if(CONFIG_COMP_TEMPLATE_COMP)
124127
add_subdirectory(template_comp)
125128
endif()

src/audio/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ rsource "mfcc/Kconfig"
168168

169169
rsource "codec/Kconfig"
170170

171+
rsource "sound_dose/Kconfig"
172+
171173
rsource "template_comp/Kconfig"
172174

173175
endmenu # "Audio components"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# SPDX-License-Identifier: BSD-3-Clause
2+
3+
if(CONFIG_COMP_TEMPLATE_COMP STREQUAL "m")
4+
add_subdirectory(llext ${PROJECT_BINARY_DIR}/sound_dose_llext)
5+
add_dependencies(app sound_dose)
6+
else()
7+
add_local_sources(sof sound_dose.c)
8+
add_local_sources(sof sound_dose-generic.c)
9+
10+
if(CONFIG_IPC_MAJOR_3)
11+
add_local_sources(sof sound_dose-ipc3.c)
12+
elseif(CONFIG_IPC_MAJOR_4)
13+
add_local_sources(sof sound_dose-ipc4.c)
14+
endif()
15+
endif()

0 commit comments

Comments
 (0)