-
Notifications
You must be signed in to change notification settings - Fork 351
topology2: add SDW echo reference function topologies #10600
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
Open
bardliao
wants to merge
7
commits into
thesofproject:main
Choose a base branch
from
bardliao:topology2-echo-ref-alternative
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
784a68a
topology2: sdw-jack-generic: always create module-copier.1.12
bardliao 9bd6367
topology2: sdw-amp-generic: always create module-copier.1.22
bardliao 2ebc805
topology2: sdw-amp-generic: change the spk echo refference pipeline ID
bardliao f2dc572
topology2: usa macro to define the echo reference pipeline id
bardliao 84c8397
topology2: split echo reference part from sdw topologies
bardliao 102370c
topology2: cavs-sdw: include echo reference file in cavs-sdw.conf
bardliao 882d260
topology2: add SDW echo reference feature topologies
bardliao 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
Some comments aren't visible on the classic Files Changed page.
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
52 changes: 52 additions & 0 deletions
52
tools/topology/topology2/platform/intel/sdw-amp-echo-ref.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,52 @@ | ||
| Define { | ||
| SDW_SPK_ECHO_REF_PCM_ID 12 | ||
| SDW_SPK_ECHO_REF_PIPELINE_ID 120 | ||
| } | ||
|
|
||
| IncludeByKey.SDW_SPK_ECHO_REF { | ||
| "true" { | ||
| Object.Pipeline { | ||
| siggen-host-copier-capture [ | ||
| { | ||
| direction "capture" | ||
| index $SDW_SPK_ECHO_REF_PIPELINE_ID | ||
| 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.$SDW_SPK_ECHO_REF_PIPELINE_ID.1" | ||
| } | ||
| { | ||
| source "module-copier.21.22" | ||
| sink "siggen.$SDW_SPK_ECHO_REF_PIPELINE_ID.1" | ||
| } | ||
| { | ||
| source "siggen.$SDW_SPK_ECHO_REF_PIPELINE_ID.1" | ||
| sink "host-copier.$SDW_SPK_ECHO_REF_PCM_ID.capture" | ||
| } | ||
| ] | ||
| } # SDW_SPK_ECHO_REF true | ||
| } | ||
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
108 changes: 108 additions & 0 deletions
108
tools/topology/topology2/platform/intel/sdw-jack-echo-ref.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,108 @@ | ||
| Define { | ||
| SDW_JACK_ECHO_REF_PCM_ID 11 | ||
| SDW_JACK_ECHO_REF_PIPELINE_ID 12 | ||
| } | ||
|
|
||
| IncludeByKey.SDW_JACK_ECHO_REF { | ||
| "true" { | ||
| Object.Pipeline { | ||
| siggen-host-copier-capture [ | ||
| { | ||
| direction "capture" | ||
| index $SDW_JACK_ECHO_REF_PIPELINE_ID | ||
| Object.Widget.host-copier."1" { | ||
| stream_name "Jack Echo Reference" | ||
| pcm_id $SDW_JACK_ECHO_REF_PCM_ID | ||
| num_input_audio_formats 1 | ||
| Object.Base.input_audio_format [ | ||
| { | ||
| in_rate $JACK_RATE | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| } | ||
| ] | ||
| num_output_audio_formats 3 | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_rate $JACK_RATE | ||
| out_bit_depth 16 | ||
| out_valid_bit_depth 16 | ||
| } | ||
| { | ||
| out_rate $JACK_RATE | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 24 | ||
| } | ||
| { | ||
| out_rate $JACK_RATE | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| } | ||
| ] | ||
| } | ||
| 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_rate $JACK_RATE | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| } | ||
| ] | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_rate $JACK_RATE | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| Object.PCM.pcm [ | ||
| { | ||
| name "Jack Echo Reference" | ||
| id $SDW_JACK_ECHO_REF_PCM_ID | ||
| direction "capture" | ||
| Object.Base.fe_dai.1 { | ||
| name "Jack Echo Reference" | ||
| } | ||
| Object.PCM.pcm_caps.1 { | ||
| name "Jack Echo Reference" | ||
| formats 'S16_LE,S24_LE,S32_LE' | ||
| } | ||
| IncludeByKey.JACK_RATE { | ||
| "48000" { | ||
| rates '48000' | ||
| } | ||
| "96000" { | ||
| rates '96000' | ||
| } | ||
| "192000" { | ||
| rates '192000' | ||
| } | ||
| } | ||
| } | ||
| ] | ||
|
|
||
| Object.Base.route [ | ||
| { | ||
| source "alh-copier.Loopback_Virtual.25" | ||
| sink "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1" | ||
| } | ||
| { | ||
| source "module-copier.1.12" | ||
| sink "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1" | ||
| } | ||
| { | ||
| source "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1" | ||
| sink "host-copier.$SDW_JACK_ECHO_REF_PCM_ID.capture" | ||
| } | ||
| ] | ||
| } # SDW_JACK_ECHO_REF true | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if we would have a global 'registry' for IDs, you would not need to define in all places, which can be error prone.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree, we can do it later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we could also add inline READM.md 's to document the main principles (like the readmes Liam has recently added to the source folders). This especially applies to the function topologies.