Skip to content

topology2: sdw-dmic-generic: add eqiir to control DC offset #9331

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

Merged
lgirdwood merged 2 commits into from
Aug 5, 2024
Merged

topology2: sdw-dmic-generic: add eqiir to control DC offset #9331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c37e8c9
topology2: sdw-jack-generic: move eqiir widget in scope of pipeline
plbossart Jul 26, 2024
22b227d
topology2: sdw-dmic-generic: add eqiir to control DC offset
plbossart Jul 26, 2024
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
57 changes: 52 additions & 5 deletions tools/topology/topology2/platform/intel/sdw-dmic-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# route and pipeline index start from pcm id * 10

Define {
SDW_DMIC_CAPTURE_PCM_NAME "Microphone"
SDW_DMIC_STREAM 'SDW3-Capture'
SDW_DMIC_BE_ID 4
SDW_DMIC_PASSTHROUGH "false"
}

Object.Dai.ALH [
Expand Down Expand Up @@ -73,6 +75,35 @@ Object.Widget {
priority 0
lp_mode 0
dynamic_pipeline 1

IncludeByKey.SDW_DMIC_PASSTHROUGH {
"false" {
Object.Widget.eqiir [
{
num_input_audio_formats 1
num_output_audio_formats 1
# index 41 is in herited from the pipeline definition
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]

Object.Control.bytes."1" {
<include/components/eqiir/highpass_40hz_0db_48khz.conf>
name '$SDW_DMIC_CAPTURE_PCM_NAME Capture IIR Eq'
}
}
]
}
}
}
]
}
Expand All @@ -93,9 +124,25 @@ Object.PCM.pcm [
}
]

Object.Base.route [
{
source "alh-copier.$SDW_DMIC_STREAM.0"
sink "host-copier.4.capture"
IncludeByKey.SDW_DMIC_PASSTHROUGH {
"true" {
Object.Base.route [
{
source "alh-copier.$SDW_DMIC_STREAM.0"
sink "host-copier.4.capture"
}
]
}
]
"false" {
Object.Base.route [
{
source "alh-copier.$SDW_DMIC_STREAM.0"
sink "eqiir.41.0"
}
{
source "eqiir.41.0"
sink "host-copier.4.capture"
}
]
}
}
53 changes: 27 additions & 26 deletions tools/topology/topology2/platform/intel/sdw-jack-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,37 +316,38 @@ Object.Widget {
priority 0
lp_mode 0
dynamic_pipeline 1
}
]
}

IncludeByKey.PASSTHROUGH {
"false" {
Object.Widget.eqiir [
{
num_input_audio_formats 1
num_output_audio_formats 1
index 11
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]
IncludeByKey.PASSTHROUGH {
"false" {
Object.Widget.eqiir [
{
num_input_audio_formats 1
num_output_audio_formats 1
# index 11 is inherited from the pipeline definition
# the instance number is automatically generated as '0'
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]

Object.Control.bytes."1" {
<include/components/eqiir/highpass_40hz_0db_48khz.conf>
name '$JACK_CAPTURE_PCM_NAME Capture IIR Eq'
Object.Control.bytes."1" {
<include/components/eqiir/highpass_40hz_0db_48khz.conf>
name '$JACK_CAPTURE_PCM_NAME Capture IIR Eq'
}
}
]
}
}
}
]
}
}

Object.PCM.pcm [
Expand Down