-
Notifications
You must be signed in to change notification settings - Fork 349
Tools: Topology2: Intel: Add enhanced speaker and DMIC processing to SDW PCs #9652
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.
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 5 commits into
thesofproject:main
from
singalsu:tplg_sdw_add_enhanced_speaker_mic
Nov 22, 2024
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
266f404
Tools: Topology2: Intel: Update SDW speaker volume control names
singalsu 8ba0144
Tools: Topology2: Use array for mixout-gain-alh-dai-copier-playback r…
singalsu a1c2e29
Tools: Topology2: Intel: Add enhanced speaker processing to SDW PCs
singalsu 98e39fe
Tools: Topology2: Intel: Add pre-processing to SDW DMIC capture
singalsu 591c2cb
Tools: Topology2: Add processing MTL and LNL SDW topologies for CI test
singalsu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
tools/topology/topology2/include/pipelines/cavs/host-gateway-tdfb-drc-capture.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| # | ||
| # Host gateway capture pipeline | ||
| # | ||
| # A host gateway pipeline for capture with TDFB and DRC processing. All attributes | ||
| # defined herein are namespaced by alsatplg to | ||
| # "Object.Pipeline.host-gateway-tdfb-drc-capture.N.attribute_name". | ||
| # | ||
| # Usage: host-gateway-tdfb-drc-capture pipeline object can be instantiated as: | ||
| # | ||
| # Object.Pipeline.host-gateway-tdfb-drc-capture."N" { | ||
| # period 1000 | ||
| # time_domain "timer" | ||
| # } | ||
| # | ||
| # Where N is the unique pipeline ID within the same alsaconf node. | ||
| # | ||
|
|
||
| <include/components/drc.conf> | ||
| <include/components/tdfb.conf> | ||
| <include/pipelines/cavs/host-gateway-capture.conf> | ||
|
|
||
| Class.Pipeline."host-gateway-tdfb-drc-capture" { | ||
|
|
||
| SubTreeCopy.baseclass { | ||
| # this class extends the host-gateway-capture pipeline class. | ||
| source "Class.Pipeline.host-gateway-capture" | ||
|
|
||
| # target node is not defined which means that the new subtree will be copied to | ||
| # the parent node containing the SubTreeCopy node i.e in this case the | ||
| # Class.Pipeline.host-gateway-tdfb-drc-capture {} node. | ||
|
|
||
| # default copy type is to extend the base class ie the widgets and routes | ||
| # will be added to the existing list of widgets/routes in the base class | ||
|
|
||
| tree { | ||
| Object.Widget { | ||
| tdfb."1" { | ||
| Object.Control { | ||
| bytes."1" { | ||
| max 16384 | ||
| IncludeByKey.EFX_MIC_TDFB_PARAMS { | ||
| "line2_pass" "include/components/tdfb/line2_pass.conf" | ||
| "line2_generic_pm10deg" "include/components/tdfb/line2_generic_pm10deg_48khz.conf" | ||
| "line2_50mm" "include/components/tdfb/line2_50mm_pm0_30_90deg_48khz.conf" | ||
| "line2_68mm" "include/components/tdfb/line2_68mm_pm0_30_90deg_48khz.conf" | ||
| "line2_74mm" "include/components/tdfb/line2_74mm_pm0_30_90deg_48khz.conf" | ||
| "line4_pass" "include/components/tdfb/line4_pass.conf" | ||
| "line4to2_pass" "include/components/tdfb/line4to2_pass.conf" | ||
| "line4_generic_pm10deg" "include/components/tdfb/line4_generic_pm10deg_48khz.conf" | ||
| "line4_28mm" "include/components/tdfb/line2_28mm_pm0_30_90deg_48khz.conf" | ||
| } | ||
| } | ||
| } | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 1 | ||
| 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 | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| drc."1" { | ||
| Object.Control { | ||
| bytes."1" { | ||
| IncludeByKey.EFX_MIC_DRC_PARAMS { | ||
| "passthrough" "include/components/drc/passthrough.conf" | ||
| "dmic_default" "include/components/drc/dmic_default.conf" | ||
| } | ||
| } | ||
| } | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 1 | ||
| 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.Base { | ||
| !route [ | ||
| { | ||
| source tdfb.$index.1 | ||
| sink drc.$index.1 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
...topology2/include/pipelines/cavs/mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| # | ||
| # BE playback pipeline: mixout-gain-eqiir-eqfir-drc-alh-dai-copier. | ||
| # | ||
| # All attributes defined herein are namespaced | ||
| # by alsatplg to "Object.Pipeline.mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback.N.attribute_name" | ||
| # | ||
| # Usage: mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback pipeline object can be instantiated as: | ||
| # | ||
| # Object.Pipeline.mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback."N" { | ||
| # time_domain "timer" | ||
| # } | ||
| # | ||
| # Where N is the unique pipeline ID within the same alsaconf node. | ||
| # | ||
|
|
||
|
|
||
| <include/components/eqiir.conf> | ||
| <include/components/eqfir.conf> | ||
| <include/components/drc.conf> | ||
| <include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf> | ||
|
|
||
| Class.Pipeline."mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback" { | ||
|
|
||
| SubTreeCopy.baseclass { | ||
| # this class extends the mixout-gain-alh-dai-copier-playback pipeline class. | ||
| source "Class.Pipeline.mixout-gain-alh-dai-copier-playback" | ||
|
|
||
| # target node is not defined which means that the new subtree will be copied to | ||
| # the parent node containing the SubTreeCopy node i.e in this case the | ||
| # Class.Pipeline.mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback {} node. | ||
|
|
||
| # default copy type is to extend the base class ie the widgets and routes | ||
| # will be added to the existing list of widgets/routes in the base class | ||
|
|
||
| tree { | ||
| Object.Widget { | ||
| eqiir."1" { | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 1 | ||
|
|
||
| # 32-bit 48KHz 2ch | ||
| 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" { | ||
| IncludeByKey.EFX_SPK_IIR_PARAMS { | ||
| "passthrough" "include/components/eqiir/passthrough.conf" | ||
| "highpass_20hz_0db_48khz" "include/components/eqiir/highpass_20hz_0db_48khz.conf" | ||
| "highpass_30hz_0db_48khz" "include/components/eqiir/highpass_30hz_0db_48khz.conf" | ||
| "highpass_40hz_0db_48khz" "include/components/eqiir/highpass_40hz_0db_48khz.conf" | ||
| "highpass_50hz_0db_48khz" "include/components/eqiir/highpass_50hz_0db_48khz.conf" | ||
| "highpass_100hz_0db_48khz" "include/components/eqiir/highpass_100hz_0db_48khz.conf" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| eqfir."1" { | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 1 | ||
|
|
||
| # 32-bit 48KHz 2ch | ||
| 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" { | ||
| IncludeByKey.EFX_SPK_FIR_PARAMS { | ||
| "passthrough" "include/components/eqfir/passthrough.conf" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| drc."1" { | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 1 | ||
|
|
||
| # 32-bit 48KHz 2ch | ||
| 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" { | ||
| IncludeByKey.EFX_SPK_DRC_PARAMS { | ||
| "passthrough" "include/components/drc/passthrough.conf" | ||
| "speaker_default" "include/components/drc/speaker_default.conf" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Object.Base { | ||
| !route [ | ||
| { | ||
| source gain.$index.1 | ||
| sink eqiir.$index.1 | ||
| } | ||
| { | ||
| source eqiir.$index.1 | ||
| sink eqfir.$index.1 | ||
| } | ||
| { | ||
| source eqfir.$index.1 | ||
| sink drc.$index.1 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.