Skip to content

topology2: add WoV test topology on HDA platform #7236

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
aiChaoSONG wants to merge 1 commit into from
Closed

topology2: add WoV test topology on HDA platform #7236

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 tools/topology/topology2/development/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-efx-generic-4ch.bin,USE_CHAIN_DMA=
DEEPBUFFER_FW_DMA_MS=100,EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough"
# CAVS HDA topology with gain and SRC before mixin for HDA and passthrough pipelines for HDMI
"sof-hda-generic\;sof-hda-src-generic\;HDA_CONFIG=src,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
# HDA topology with WoV enabled
"sof-hda-generic\;sof-mtl-hda-generic-2ch-kwd\;PLATFORM=mtl,HDA_CONFIG=mix,NUM_DMICS=2,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-hda-generic-2ch-kwd.bin,INCLUDE_WOV=true,\
DEEPBUFFER_FW_DMA_MS=100"
Copy link
Contributor

@ujfalusi ujfalusi Mar 9, 2023

Choose a reason for hiding this comment

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

should we have test modules in generic, used in real devices, products topology? I don't really want to have this on my personal laptop, to be honest...

Copy link
Collaborator

@kv2019i kv2019i Mar 9, 2023

Choose a reason for hiding this comment

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

@ujfalusi This is in development/ folder, not to be shipped (e.g. sod-hda-src-generic is not shipped).

Copy link
Contributor

@ujfalusi ujfalusi Mar 9, 2023

Choose a reason for hiding this comment

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

Oh, right, it was not indicated in commit title or message..

)
add_custom_target(topology2_dev)

Expand Down
18 changes: 18 additions & 0 deletions tools/topology/topology2/sof-hda-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
<gain-capture.conf>
<deepbuffer-playback.conf>
<passthrough-be.conf>
<dai-kpb-be.conf>
<wov-detect.conf>
<passthrough-capture-be.conf>
<highpass-capture-be.conf>
<data.conf>
Expand All @@ -32,6 +34,10 @@
<hw_config.conf>
<manifest.conf>
<route.conf>
<output_pin_binding.conf>
<kpb.conf>
<input_audio_format.conf>
<output_audio_format.conf>
<common_definitions.conf>
<dmic-default.conf>
<hdmi-default.conf>
Expand All @@ -48,6 +54,18 @@ Define {
DMIC0_DAI_GAIN 'eqiir.12.1'
DMIC0_DAI_EQIIR "highpass_40hz_20db"
DMIC0_PCM_CAPS 'Gain Capture 11'
DMIC1_PCM_CAPS 'DMIC1 WOV Capture'
DMIC1_HOST_PIPELINE_ID 16
DMIC1_DAI_PIPELINE_ID 17
WOV_PIPELINE_ID 18
DMIC1_HOST_PIPELINE_SINK 'copier.host.16.1'
DMIC_WOV_DAI_PIPELINE_SRC 'copier.DMIC.17.1'
DMIC_WOV_DAI_PIPELINE_KPB 'kpb.17.1'
WOV_PIPELINE_SINK 'micsel.18.1'
Copy link
Contributor

@ujfalusi ujfalusi Mar 9, 2023

Choose a reason for hiding this comment

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

The dmic-default.conf defines this:
WOV_PIPELINE_SINK 'micsel.20.1'
and most of these are also found in there, so we change them here? Why not in there?

Copy link
Collaborator Author

@aiChaoSONG aiChaoSONG Mar 10, 2023

Choose a reason for hiding this comment

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

dmic-default.conf defines the default values used commonly for dmic, in most cases, if there is exception, we should do the change in the top-level topology.

WOV_PIPELINE_VIRTUAL 'virtual.detect_sink'
WOV_CPC '360000'
DMIC1_PCM_CAPS 'DMIC1 WOV Capture'
DMIC1_PIPELINE_STREAM_NAME 'copier.DMIC.17.1'
}

# override defaults with platform-specific config
Expand Down