-
Notifications
You must be signed in to change notification settings - Fork 350
Tools: Topology: Add selector to compress playback pipeline #10618
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
singalsu
wants to merge
2
commits into
thesofproject:main
Choose a base branch
from
singalsu:tplg_add_selector_to_compress
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.
+386
−520
Open
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
107 changes: 107 additions & 0 deletions
107
tools/topology/topology2/include/formats/compr_input_audio_formats.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,107 @@ | ||
| # All input formats for e.g. host-copier, decoder, | ||
| # and module-copier | ||
| num_input_audio_formats 40 | ||
| CombineArrays.Object.Base.input_audio_format [ | ||
| { | ||
| in_channels [ 1 ] | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 8 ] | ||
| in_valid_bit_depth [ 8 ] | ||
| in_sample_type [ $SAMPLE_TYPE_UNSIGNED_INTEGER ] | ||
| in_ch_map [ $CHANNEL_MAP_MONO ] | ||
| in_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| in_channels [ 1 ] | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 16 ] | ||
| in_valid_bit_depth [ 16 ] | ||
| in_ch_map [ $CHANNEL_MAP_MONO ] | ||
| in_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| in_channels [ 1 ] | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 32 ] | ||
| in_valid_bit_depth [ 24 ] | ||
| in_ch_map [ $CHANNEL_MAP_MONO ] | ||
| in_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| in_channels [ 1 ] | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 32 ] | ||
| in_valid_bit_depth [ 32 ] | ||
| in_ch_map [ $CHANNEL_MAP_MONO ] | ||
| in_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 8 ] | ||
| in_valid_bit_depth [ 8 ] | ||
| in_sample_type [ $SAMPLE_TYPE_UNSIGNED_INTEGER ] | ||
| } | ||
| { | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 16 ] | ||
| in_valid_bit_depth [ 16 ] | ||
| } | ||
| { | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 32 ] | ||
| in_valid_bit_depth [ 24 ] | ||
| } | ||
| { | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 32 ] | ||
| in_valid_bit_depth [ 32 ] | ||
| } | ||
| ] |
29 changes: 29 additions & 0 deletions
29
tools/topology/topology2/include/formats/compr_input_audio_formats_s32_48k.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,29 @@ | ||
| # Input formats for e.g. micsel | ||
| num_input_audio_formats 10 | ||
| CombineArrays.Object.Base.input_audio_format [ | ||
| { | ||
| in_channels [ 1 ] | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 32 ] | ||
| in_valid_bit_depth [ 32 ] | ||
| in_ch_map [ $CHANNEL_MAP_MONO ] | ||
| in_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| in_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 32 ] | ||
| in_valid_bit_depth [ 32 ] | ||
| } | ||
| ] |
65 changes: 65 additions & 0 deletions
65
tools/topology/topology2/include/formats/compr_input_output_formats_src_s32_to_48k.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,65 @@ | ||
| # Input and output audio formats for SRC | ||
| num_input_audio_formats 28 | ||
| CombineArrays.Object.Base.input_audio_format [ | ||
| { | ||
| in_channels [ 1 ] | ||
| in_rate [ | ||
| 8000 | ||
| 11025 | ||
| 12000 | ||
| 16000 | ||
| 22050 | ||
| 24000 | ||
| 32000 | ||
| 44100 | ||
| 48000 | ||
| 64000 | ||
| 88200 | ||
| 96000 | ||
| 176400 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 32 ] | ||
| in_valid_bit_depth [ 32 ] | ||
| in_ch_map [ $CHANNEL_MAP_MONO ] | ||
| in_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| in_rate [ | ||
| 8000 | ||
| 11025 | ||
| 12000 | ||
| 16000 | ||
| 22050 | ||
| 24000 | ||
| 32000 | ||
| 44100 | ||
| 48000 | ||
| 64000 | ||
| 88200 | ||
| 96000 | ||
| 176400 | ||
| 192000 | ||
| ] | ||
| in_bit_depth [ 32 ] | ||
| in_valid_bit_depth [ 32 ] | ||
| } | ||
| ] | ||
|
|
||
| num_output_audio_formats 2 | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_channels 1 | ||
| out_rate 48000 | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| out_ch_map $CHANNEL_MAP_MONO | ||
| out_ch_cfg $CHANNEL_CONFIG_MONO | ||
| } | ||
| { | ||
| out_channels 2 | ||
| out_rate 48000 | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| } | ||
| ] |
106 changes: 106 additions & 0 deletions
106
tools/topology/topology2/include/formats/compr_output_audio_formats.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 @@ | ||
| # Output audio formats for e.g. host-copier and decoder | ||
| num_output_audio_formats 40 | ||
| CombineArrays.Object.Base.output_audio_format [ | ||
| { | ||
| out_channels [ 1 ] | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 8 ] | ||
| out_valid_bit_depth [ 8 ] | ||
| out_sample_type [ $SAMPLE_TYPE_UNSIGNED_INTEGER ] | ||
| out_ch_map [ $CHANNEL_MAP_MONO ] | ||
| out_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| out_channels [ 1 ] | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 16 ] | ||
| out_valid_bit_depth [ 16 ] | ||
| out_ch_map [ $CHANNEL_MAP_MONO ] | ||
| out_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| out_channels [ 1 ] | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 32 ] | ||
| out_valid_bit_depth [ 24 ] | ||
| out_ch_map [ $CHANNEL_MAP_MONO ] | ||
| out_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| out_channels [ 1 ] | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 32 ] | ||
| out_valid_bit_depth [ 32 ] | ||
| out_ch_map [ $CHANNEL_MAP_MONO ] | ||
| out_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 8 ] | ||
| out_valid_bit_depth [ 8 ] | ||
| out_sample_type [ $SAMPLE_TYPE_UNSIGNED_INTEGER ] | ||
| } | ||
| { | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 16 ] | ||
| out_valid_bit_depth [ 16 ] | ||
| } | ||
| { | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 32 ] | ||
| out_valid_bit_depth [ 24 ] | ||
| } | ||
| { | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 32 ] | ||
| out_valid_bit_depth [ 32 ] | ||
| } | ||
| ] |
29 changes: 29 additions & 0 deletions
29
tools/topology/topology2/include/formats/compr_output_audio_formats_s32.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,29 @@ | ||
| # Output audio formats e.g. module-copier | ||
| num_output_audio_formats 10 | ||
| CombineArrays.Object.Base.output_audio_format [ | ||
| { | ||
| out_channels [ 1 ] | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 32 ] | ||
| out_valid_bit_depth [ 32 ] | ||
| out_ch_map [ $CHANNEL_MAP_MONO ] | ||
| out_ch_cfg [ $CHANNEL_CONFIG_MONO ] | ||
| } | ||
| { | ||
| out_rate [ | ||
| 8000 | ||
| 44100 | ||
| 48000 | ||
| 96000 | ||
| 192000 | ||
| ] | ||
| out_bit_depth [ 32 ] | ||
| out_valid_bit_depth [ 32 ] | ||
| } | ||
| ] |
10 changes: 10 additions & 0 deletions
10
tools/topology/topology2/include/formats/compr_output_audio_formats_s32_48k_stereo.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,10 @@ | ||
| # Micsel single format output | ||
| num_output_audio_formats 1 | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_channels 2 | ||
| out_rate 48000 | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| } | ||
| ] |
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
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 pipeline instantiates a
srcwidget (src."1" {}) but does not includeinclude/components/src.confin the header includes. This makes the pipeline definition depend on external include order and is inconsistent with other pipeline templates that include their component classes explicitly. Add the missingsrc.confinclude here to keep the pipeline self-contained.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.
ok