Tools: Topology: Add echo reference for SDW speaker and jack #10387
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
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
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
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,98 @@ | ||
| # | ||
| # Siggen capture pipeline | ||
| # | ||
| # This class provides host pipeline for capture with siggen input. All | ||
| # attributes defined herein are namespaced by alsatplg to | ||
| # "Object.Pipeline.siggen-host-copier-capture.N.attribute_name". | ||
| # | ||
| # Usage: siggen-host-copier-capture pipeline object can be instantiated as: | ||
| # | ||
| # Object.Pipeline.siggen-host-copier-capture."N" { | ||
| # period 1000 | ||
| # time_domain "timer" | ||
| # } | ||
| # | ||
| # Where N is the unique pipeline ID within the same alsaconf node. | ||
| # | ||
|
|
||
| <include/common/input_audio_format.conf> | ||
| <include/common/output_audio_format.conf> | ||
| <include/components/pipeline.conf> | ||
| <include/components/host-copier.conf> | ||
| <include/components/siggen.conf> | ||
|
|
||
| Class.Pipeline."siggen-host-copier-capture" { | ||
|
|
||
| <include/pipelines/pipeline-common.conf> | ||
|
|
||
| attributes { | ||
| !constructor [ | ||
| "index" | ||
| ] | ||
|
|
||
| # | ||
| # siggen-host-copier-capture objects instantiated within the same alsaconf | ||
| # node must have unique pipeline_id attribute | ||
| # | ||
| unique "instance" | ||
| } | ||
|
|
||
| Object.Widget { | ||
| siggen."1" { | ||
| num_input_pins 1 | ||
| num_output_pins 1 | ||
| 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 | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| host-copier."1" { | ||
| type "aif_out" | ||
| node_type $HDA_HOST_INPUT_CLASS | ||
| num_input_pins 1 | ||
| num_output_pins 1 | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 3 | ||
| Object.Base.input_audio_format [ | ||
| { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| } | ||
| ] | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_bit_depth 16 | ||
| out_valid_bit_depth 16 | ||
| } | ||
| { | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 24 | ||
| } | ||
| { | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| pipeline."1" { | ||
| priority 0 | ||
| lp_mode 0 | ||
| } | ||
| } | ||
|
|
||
| direction "capture" | ||
| dynamic_pipeline 1 | ||
| time_domain "timer" | ||
| } | ||
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 | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -13,6 +13,7 @@ Define { | |||||||
| AMP_FEEDBACK_CH_PER_LINK 2 | ||||||||
| SDW_AMP_FEEDBACK true | ||||||||
| AMP_PLAYBACK_NAME 'Speaker Playback' | ||||||||
| SDW_SPK_ECHO_REF_PCM_ID 12 | ||||||||
| } | ||||||||
|
|
||||||||
| Object.Dai.ALH [ | ||||||||
|
|
@@ -636,44 +637,76 @@ Object.PCM.pcm [ | |||||||
| ] | ||||||||
|
|
||||||||
| IncludeByKey.PASSTHROUGH { | ||||||||
| "false" { | ||||||||
| IncludeByKey.SDW_SPK_ECHO_REF { | ||||||||
| "true" { | ||||||||
| IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK { | ||||||||
| "true" { | ||||||||
| Object.Base.route [ | ||||||||
| { | ||||||||
| source "drc.21.1" | ||||||||
| sink "module-copier.21.22" | ||||||||
| } | ||||||||
| { | ||||||||
| source "module-copier.21.22" | ||||||||
| sink "alh-copier.$SDW_SPK_STREAM.0" | ||||||||
| } | ||||||||
| ] | ||||||||
| } | ||||||||
| "false" { | ||||||||
| Object.Base.route [ | ||||||||
| { | ||||||||
| source "gain.21.1" | ||||||||
| sink "module-copier.21.22" | ||||||||
| } | ||||||||
| { | ||||||||
| source "module-copier.21.22" | ||||||||
| sink "alh-copier.$SDW_SPK_STREAM.0" | ||||||||
| } | ||||||||
| ] | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
| "false" { | ||||||||
| IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK { | ||||||||
| "true" { | ||||||||
| Object.Base.route [ | ||||||||
| { | ||||||||
| source "drc.21.1" | ||||||||
| sink "alh-copier.$SDW_SPK_STREAM.0" | ||||||||
| } | ||||||||
| ] | ||||||||
| } | ||||||||
| "false" { | ||||||||
| Object.Base.route [ | ||||||||
| { | ||||||||
| source "gain.21.1" | ||||||||
| sink "alh-copier.$SDW_SPK_STREAM.0" | ||||||||
| } | ||||||||
| ] | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
| Object.Base.route [ | ||||||||
| { | ||||||||
| source 'mixin.20.1' | ||||||||
| sink 'mixout.21.1' | ||||||||
| } | ||||||||
| { | ||||||||
| source 'host-copier.2.playback' | ||||||||
| sink 'gain.20.1' | ||||||||
| } | ||||||||
| ] | ||||||||
| } | ||||||||
| "true" { | ||||||||
|
Collaborator
There was a problem hiding this comment. @singalsu no need to change this PR, but @ranj063 @jsarha I was wondering if we started adding inline comments to there branches line the C conventions for ifdefs, would that make the nested conditional segments a bit more easy to follow. E.g. here on L702 "# PASSTHROUGH==true " and then the definition. What do you think?
Collaborator
Author
There was a problem hiding this comment. I think it would be good. I'm quite confused with long chunks of stuff. And our indents also are not always right. |
||||||||
| Object.Base.route [ | ||||||||
| { | ||||||||
| source "host-copier.2.playback" | ||||||||
| sink "alh-copier.$SDW_SPK_STREAM.0" | ||||||||
| } | ||||||||
| ] | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| IncludeByKey.SDW_AMP_FEEDBACK { | ||||||||
|
|
@@ -885,3 +918,98 @@ IncludeByKey.SDW_AMP_FEEDBACK { | |||||||
| ] | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| IncludeByKey.SDW_SPK_ECHO_REF { | ||||||||
| "true" { | ||||||||
| Object.Widget.alh-copier [ | ||||||||
| { | ||||||||
| stream_name "Loopback_Virtual" | ||||||||
| direction "capture" | ||||||||
| type "dai_out" | ||||||||
| index 22 | ||||||||
| dai_index 25 | ||||||||
| node_type $ALH_LINK_INPUT_CLASS | ||||||||
| num_input_audio_formats 1 | ||||||||
| num_output_audio_formats 1 | ||||||||
| Object.Base.input_audio_format [ | ||||||||
singalsu marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||
| { | ||||||||
| in_bit_depth 32 | ||||||||
| in_valid_bit_depth $SDW_LINK_VALID_BITS | ||||||||
| in_sample_type $SAMPLE_TYPE_MSB_INTEGER | ||||||||
| in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]" | ||||||||
|
There was a problem hiding this comment. The alh-copier input_audio_format block (lines 936-939) is missing the
Suggested change
Collaborator
Author
There was a problem hiding this comment. We operate the speaker pipelines with the default rate (48 kHz) from classes. It should be added everywhere in the large topology fragment, so not doing it unless we add other rates options for speaker. |
||||||||
| } | ||||||||
| ] | ||||||||
singalsu marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||
| Object.Base.output_audio_format [ | ||||||||
| { | ||||||||
| out_bit_depth 32 | ||||||||
|
There was a problem hiding this comment. The output_audio_format block (lines 944-945) is missing the
Suggested change
Collaborator
Author
There was a problem hiding this comment. Same, not adding rates to speaker. |
||||||||
| out_valid_bit_depth 32 | ||||||||
| } | ||||||||
| ] | ||||||||
| } | ||||||||
| ] | ||||||||
|
|
||||||||
| Object.Widget.module-copier."22" { | ||||||||
| index 21 | ||||||||
| num_input_pins 1 | ||||||||
| num_output_pins 2 | ||||||||
| 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.Pipeline { | ||||||||
| siggen-host-copier-capture [ | ||||||||
| { | ||||||||
| direction "capture" | ||||||||
| index 22 | ||||||||
| Object.Widget.host-copier."1" { | ||||||||
| stream_name "Speaker Echo Reference" | ||||||||
| pcm_id $SDW_SPK_ECHO_REF_PCM_ID | ||||||||
| } | ||||||||
| Object.Widget.siggen."1" {} | ||||||||
| } | ||||||||
| ] | ||||||||
| } | ||||||||
|
|
||||||||
| Object.PCM.pcm [ | ||||||||
| { | ||||||||
| name "Speaker Echo Reference" | ||||||||
| id $SDW_SPK_ECHO_REF_PCM_ID | ||||||||
| direction "capture" | ||||||||
| Object.Base.fe_dai.1 { | ||||||||
| name "Speaker Echo Reference" | ||||||||
| } | ||||||||
| Object.PCM.pcm_caps.1 { | ||||||||
| name "Speaker Echo Reference" | ||||||||
| formats 'S16_LE,S24_LE,S32_LE' | ||||||||
| } | ||||||||
| } | ||||||||
| ] | ||||||||
|
|
||||||||
| Object.Base.route [ | ||||||||
| { | ||||||||
| source "alh-copier.Loopback_Virtual.25" | ||||||||
| sink "siggen.22.1" | ||||||||
| } | ||||||||
| { | ||||||||
| source "module-copier.21.22" | ||||||||
| sink "siggen.22.1" | ||||||||
| } | ||||||||
| { | ||||||||
| source "siggen.22.1" | ||||||||
| sink "host-copier.$SDW_SPK_ECHO_REF_PCM_ID.capture" | ||||||||
| } | ||||||||
| ] | ||||||||
| } # SDW_SPK_ECHO_REF true | ||||||||
| } | ||||||||
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.