diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index 398b0f86abb9..6d7c36d35b8c 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -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 [ { @@ -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 + } { in_bit_depth 16 in_valid_bit_depth 16 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/tools/topology/topology2/include/pipelines/cavs/host-copier-micsel-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-copier-micsel-gain-mixin-playback.conf index fcf0598c3e8d..a212dde29eb7 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-copier-micsel-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-copier-micsel-gain-mixin-playback.conf @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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