-
Notifications
You must be signed in to change notification settings - Fork 369
audio: ctc: add Google CTC integration and support for PTL SDCA topologies #11081
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
Draft
eddy1021
wants to merge
2
commits into
thesofproject:ptl-008-drop-stable
Choose a base branch
from
eddy1021:ptl-008-google-ctc
base: ptl-008-drop-stable
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.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| CONFIG_COMP_IIR=m | ||
| CONFIG_COMP_MODULE_ADAPTER=y | ||
| CONFIG_DTS_CODEC=y | ||
| CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING=y | ||
| CONFIG_MINIMAL_LIBC=n | ||
| CONFIG_PICOLIBC=y | ||
| CONFIG_LLEXT_HEAP_SIZE=64 | ||
| CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n | ||
| CONFIG_SOF_STACK_SIZE=8192 |
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
189 changes: 189 additions & 0 deletions
189
...y/topology2/include/pipelines/cavs/mixout-gain-eqiir-dts-ctc-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,189 @@ | ||
| # | ||
| # BE playback pipeline: mixout-gain-eqiir-dts-ctc-alh-dai-copier. | ||
| # | ||
| # All attributes defined herein are namespaced | ||
| # by alsatplg to "Object.Pipeline.mixout-gain-eqiir-dts-ctc-alh-dai-copier-playback.N.attribute_name" | ||
| # | ||
| # Usage: mixout-gain-eqiir-dts-ctc-alh-dai-copier-playback pipeline object can be instantiated as: | ||
| # | ||
| # Object.Pipeline.mixout-gain-eqiir-dts-ctc-alh-dai-copier-playback."N" { | ||
| # time_domain "timer" | ||
| # } | ||
| # | ||
| # Where N is the unique pipeline ID within the same alsaconf node. | ||
| # | ||
|
|
||
| <include/components/alh-dai-copier.conf> | ||
| <include/components/gain.conf> | ||
| <include/components/mixout.conf> | ||
| <include/components/pipeline.conf> | ||
| <include/controls/bytes.conf> | ||
| <include/components/eqiir.conf> | ||
| <include/components/dts.conf> | ||
| <include/components/ctc.conf> | ||
|
|
||
| Class.Pipeline."mixout-gain-eqiir-dts-ctc-alh-dai-copier-playback" { | ||
|
|
||
| <include/pipelines/pipeline-common.conf> | ||
|
|
||
| attributes { | ||
| !constructor [ | ||
| "index" | ||
| ] | ||
|
|
||
| !immutable [ | ||
| "direction" | ||
| ] | ||
|
|
||
| # | ||
| # mixout-gain-eqiir-dts-ctc-alh-dai-copier-playback objects instantiated within the same alsaconf | ||
| # node must have unique instance attribute | ||
| # | ||
| unique "instance" | ||
| } | ||
|
|
||
| Object.Widget { | ||
| mixout."1" {} | ||
| alh-copier."1" { | ||
| type dai_in | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 1 | ||
| num_input_pins 1 | ||
|
|
||
| # copier only supports one format based on mixin/mixout requirements: | ||
| # 32-bit 48KHz 2ch | ||
| Object.Base.input_audio_format [ | ||
| { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| in_sample_type $SAMPLE_TYPE_MSB_INTEGER | ||
| in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]" | ||
| } | ||
| ] | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| out_sample_type $SAMPLE_TYPE_MSB_INTEGER | ||
| out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]" | ||
| } | ||
| ] | ||
| } | ||
| gain."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 | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| eqiir."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 | ||
| } | ||
| ] | ||
|
|
||
| Object.Control.bytes."1" { | ||
| <include/components/eqiir/flat.conf> | ||
| } | ||
| } | ||
|
|
||
| dts."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 | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| ctc."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 | ||
| } | ||
| ] | ||
|
|
||
| Object.Control { | ||
| mixer."1" { | ||
| name 'CTC Switch' | ||
| } | ||
| bytes."1" { | ||
| name 'CTC.0' | ||
| max 4160 | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pipeline."1" { | ||
| priority 0 | ||
| lp_mode 0 | ||
| } | ||
| } | ||
|
|
||
| Object.Base { | ||
| !route [ | ||
| { | ||
| source mixout.$index.1 | ||
| sink gain.$index.1 | ||
| } | ||
| { | ||
| source gain.$index.1 | ||
| sink eqiir.$index.1 | ||
| } | ||
| { | ||
| source eqiir.$index.1 | ||
| sink dts.$index.1 | ||
| } | ||
| { | ||
| source dts.$index.1 | ||
| sink ctc.$index.1 | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| direction "playback" | ||
| dynamic_pipeline 1 | ||
| time_domain "timer" | ||
| } |
66 changes: 66 additions & 0 deletions
66
...logy2/include/pipelines/cavs/mixout-gain-eqiir-eqfir-drc-ctc-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,66 @@ | ||
| # | ||
| # BE playback pipeline: mixout-gain-eqiir-eqfir-drc-ctc-alh-dai-copier. | ||
| # | ||
|
|
||
| <include/components/ctc.conf> | ||
| <include/pipelines/cavs/mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback.conf> | ||
|
|
||
| Class.Pipeline."mixout-gain-eqiir-eqfir-drc-ctc-alh-dai-copier-playback" { | ||
|
|
||
| SubTreeCopy.baseclass { | ||
| source "Class.Pipeline.mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback" | ||
|
|
||
| tree { | ||
| Object.Widget { | ||
| ctc."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 | ||
| } | ||
| ] | ||
|
|
||
| Object.Control { | ||
| mixer."1" { | ||
| name 'CTC Switch' | ||
| } | ||
| bytes."1" { | ||
| name 'CTC.0' | ||
| max 4160 | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| 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 | ||
| } | ||
| { | ||
| source drc.$index.1 | ||
| sink ctc.$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.
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.
this is valid only for CTC modules, right? Can this be made more specific to only pass in those cases and to continue failing in all others?