Skip to content

Tools: Topology: Add 7 channel to up/downmix in nocodec #10107

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.

Sign up for GitHub

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

Closed
ujfalusi wants to merge 1 commit into from
Closed

Tools: Topology: Add 7 channel to up/downmix in nocodec #10107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 63 additions & 2 deletions tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ IncludeByKey.PASSTHROUGH {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Playback'
pcm_id 0
num_input_audio_formats 49
num_output_audio_formats 7
num_input_audio_formats 50
num_output_audio_formats 8

Object.Base.input_audio_format [
{
Expand Down Expand Up @@ -271,6 +271,13 @@ IncludeByKey.PASSTHROUGH {
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 16
in_valid_bit_depth 16
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
Copy link
Contributor Author

@ujfalusi ujfalusi Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these ch config should be fixed, it is not correct.

}
{
in_bit_depth 16
in_valid_bit_depth 16
Expand Down Expand Up @@ -321,6 +328,13 @@ IncludeByKey.PASSTHROUGH {
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 24
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 24
Expand Down Expand Up @@ -370,6 +384,13 @@ IncludeByKey.PASSTHROUGH {
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 32
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 32
Expand Down Expand Up @@ -425,6 +446,14 @@ IncludeByKey.PASSTHROUGH {
in_ch_map $CHANNEL_MAP_5_POINT_1
in_sample_type $SAMPLE_TYPE_FLOAT
}
{
in_bit_depth 32
in_valid_bit_depth 32
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
in_sample_type $SAMPLE_TYPE_FLOAT
}
{
in_bit_depth 32
in_valid_bit_depth 32
Expand Down Expand Up @@ -481,6 +510,14 @@ IncludeByKey.PASSTHROUGH {
in_ch_map $CHANNEL_MAP_5_POINT_1
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
}
{
in_bit_depth 8
in_valid_bit_depth 8
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
}
{
in_bit_depth 8
in_valid_bit_depth 8
Expand Down Expand Up @@ -537,6 +574,14 @@ IncludeByKey.PASSTHROUGH {
in_ch_map $CHANNEL_MAP_5_POINT_1
in_sample_type $SAMPLE_TYPE_A_LAW
}
{
in_bit_depth 8
in_valid_bit_depth 8
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
in_sample_type $SAMPLE_TYPE_A_LAW
}
{
in_bit_depth 8
in_valid_bit_depth 8
Expand Down Expand Up @@ -593,6 +638,14 @@ IncludeByKey.PASSTHROUGH {
in_ch_map $CHANNEL_MAP_5_POINT_1
in_sample_type $SAMPLE_TYPE_MU_LAW
}
{
in_bit_depth 8
in_valid_bit_depth 8
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
in_sample_type $SAMPLE_TYPE_MU_LAW
}
{
in_bit_depth 8
in_valid_bit_depth 8
Expand Down Expand Up @@ -651,6 +704,14 @@ IncludeByKey.PASSTHROUGH {
out_ch_map $CHANNEL_MAP_5_POINT_1
out_sample_type $SAMPLE_TYPE_LSB_INTEGER
}
{
out_bit_depth 32
out_valid_bit_depth 32
out_channels 7
out_ch_cfg $CHANNEL_CONFIG_5_POINT_1
out_ch_map $CHANNEL_MAP_5_POINT_1
out_sample_type $SAMPLE_TYPE_LSB_INTEGER
}
{
out_bit_depth 32
out_valid_bit_depth 32
Expand Down
37 changes: 36 additions & 1 deletion tools/topology/topology2/include/pipelines/cavs/host-copier-micsel-gain-mixin-playback.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 16
in_valid_bit_depth 16
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 16
in_valid_bit_depth 16
Expand Down Expand Up @@ -140,6 +147,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 24
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 24
Expand Down Expand Up @@ -189,6 +203,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 32
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 32
Expand Down Expand Up @@ -240,6 +261,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
out_ch_cfg $CHANNEL_CONFIG_5_POINT_1
out_ch_map $CHANNEL_MAP_5_POINT_1
}
{
out_bit_depth 32
out_valid_bit_depth 32
out_channels 7
out_ch_cfg $CHANNEL_CONFIG_5_POINT_1
out_ch_map $CHANNEL_MAP_5_POINT_1
}
{
out_bit_depth 32
out_valid_bit_depth 32
Expand All @@ -251,7 +279,7 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
}

micsel."1" {
num_input_audio_formats 7
num_input_audio_formats 8
Object.Base.input_audio_format [
{
in_bit_depth 32
Expand Down Expand Up @@ -295,6 +323,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 32
in_channels 7
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
in_ch_map $CHANNEL_MAP_5_POINT_1
}
{
in_bit_depth 32
in_valid_bit_depth 32
Expand Down
Loading