-
Notifications
You must be signed in to change notification settings - Fork 367
topology2: add reference capture for MAX98357A speaker amp #6880
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
Merged
Changes from all commits
Commits
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
102 changes: 102 additions & 0 deletions
102
tools/topology/topology2/include/pipelines/cavs/dai-copier-be.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,102 @@ | ||
| # | ||
| # BE DAI copier pipeline | ||
| # | ||
| # All attributes defined herein are namespaced by alsatplg to | ||
| # "Object.Pipeline.dai-copier-be.N.attribute_name" | ||
| # | ||
| # Usage: dai-copier-be pipeline object can be instantiated as: | ||
| # | ||
| # Object.Pipeline.dai-copier-be."N" { | ||
| # period 1000 | ||
| # time_domain "timer" | ||
| # channels 2 | ||
| # rate 48000 | ||
| # } | ||
| # | ||
| # Where N is the unique pipeline ID within the same alsaconf node. | ||
| # | ||
|
|
||
| <include/common/audio_format.conf> | ||
| <include/components/copier.conf> | ||
| <include/components/pipeline.conf> | ||
|
|
||
| Class.Pipeline."dai-copier-be" { | ||
|
|
||
| DefineAttribute."index" {} | ||
|
|
||
| <include/pipelines/pipeline-common.conf> | ||
|
|
||
| attributes { | ||
| !constructor [ | ||
| "index" | ||
| ] | ||
|
|
||
| unique "instance" | ||
| } | ||
|
|
||
| Object.Widget { | ||
| copier."1" { | ||
| type dai_in | ||
| node_type $HDA_LINK_OUTPUT_CLASS | ||
| num_audio_formats 3 | ||
| # 32-bit 48KHz 2ch | ||
| Object.Base.audio_format.1 { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| dma_buffer_size "$[$obs * 2]" | ||
| } | ||
| # 32-bit 48KHz 4ch | ||
| Object.Base.audio_format.2 { | ||
| in_channels 4 | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| out_channels 4 | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| dma_buffer_size "$[$obs * 2]" | ||
| in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 | ||
| in_ch_map $CHANNEL_MAP_3_POINT_1 | ||
| out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 | ||
| out_ch_map $CHANNEL_MAP_3_POINT_1 | ||
| } | ||
| # 24-bit 48KHz 2ch | ||
| Object.Base.audio_format.3 { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 24 | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 24 | ||
| dma_buffer_size "$[$obs * 2]" | ||
| } | ||
| } | ||
|
|
||
| copier."2" { | ||
| type buffer | ||
| copier_type "module" | ||
| num_audio_formats 1 | ||
|
|
||
| Object.Base.audio_format.1 { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| dma_buffer_size "$[$ibs * 2]" | ||
| } | ||
| } | ||
|
|
||
| pipeline."1" { | ||
| priority 0 | ||
| lp_mode 0 | ||
| } | ||
| } | ||
|
|
||
| time_domain "timer" | ||
| dynamic_pipeline 1 | ||
| channels 2 | ||
| channels_min 2 | ||
| channels_max 2 | ||
| rate 48000 | ||
| rate_min 48000 | ||
| rate_max 48000 | ||
| } |
58 changes: 58 additions & 0 deletions
58
tools/topology/topology2/platform/intel/speaker-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,58 @@ | ||
| Define { | ||
| ECHO_REF_STREAM_NAME "Echo reference" | ||
| } | ||
|
|
||
| Object.Pipeline { | ||
| passthrough-capture.2 { | ||
| index $ECHO_REF_HOST_PIPELINE_ID | ||
|
|
||
| Object.Widget.copier.1 { | ||
| stream_name $ECHO_REF_STREAM_NAME | ||
| } | ||
| } | ||
|
|
||
| dai-copier-be.2 { | ||
| index $ECHO_REF_DAI_PIPELINE_ID | ||
|
|
||
| Object.Widget.copier."1" { | ||
| dai_index 1 | ||
| dai_type "SSP" | ||
| type dai_out | ||
| copier_type "SSP" | ||
| stream_name $SPEAKER_CODEC_NAME | ||
| node_type $I2S_LINK_INPUT_CLASS | ||
| Object.Base.audio_format.1 { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| dma_buffer_size "$[$ibs * 2]" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Object.PCM { | ||
| pcm."2" { | ||
| name "EchoRef" | ||
| id 27 | ||
| direction "capture" | ||
| Object.Base.fe_dai.1 {} | ||
|
|
||
| Object.PCM.pcm_caps.1 { | ||
| name $ECHO_REF_STREAM_NAME | ||
| formats 'S16_LE,S24_LE,S32_LE' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Object.Base { | ||
| route."7" { | ||
| source $ECHO_REF_DAI_PIPELINE_SRC | ||
| sink $ECHO_REF_COPIER_MODULE | ||
| } | ||
| route."8" { | ||
| source $ECHO_REF_COPIER_MODULE | ||
| sink $ECHO_REF_HOST_PIPELINE_SINK | ||
| } | ||
| } | ||
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
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.
BTW @yongzhi1 if you want to give it a try. you can start your object instances from 1 for the pcm and routes in this conf file with this PR alsa-project/alsa-utils#188. The compiler will take care of avoiding clashes with the top-level file objects
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.
Lets do this as part of the topology2 feature cleanup. @jsarha fyi.