Tools: Topology2: Add mono formats to dmic1-mfcc.conf

This patch adds the missing mono formats to dmic1-mfcc.conf for Intel platforms. Signed-off-by: Seppo Ingalsuo <[email protected]>
thesofproject · Jan 10, 2025 · 904679e · 904679e
1 parent 2703636
commit 904679e
Showing 1 changed file with 151 additions and 0 deletions.
diff --git a/tools/topology/topology2/platform/intel/dmic1-mfcc.conf b/tools/topology/topology2/platform/intel/dmic1-mfcc.conf
@@ -14,6 +14,28 @@ Object.Pipeline.host-gateway-capture [
 			num_input_audio_formats 1
 			num_output_audio_formats 1
 			IncludeByKey.NUM_DMICS {
+				"1" {
+					Object.Base.input_audio_format [
+						{
+							in_rate			$DMIC1_RATE
+							in_channels		1
+							in_bit_depth		16
+							in_valid_bit_depth	16
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+							in_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+					Object.Base.output_audio_format [
+						{
+							out_rate		$DMIC1_RATE
+							out_channels		1
+							out_bit_depth		16
+							out_valid_bit_depth	16
+							out_ch_cfg		$CHANNEL_CONFIG_MONO
+							out_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+				}
 				"2" {
 					Object.Base.input_audio_format [
 						{
@@ -75,6 +97,45 @@ Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
 			num_input_audio_formats		3
 			num_output_audio_formats	1
 			IncludeByKey.NUM_DMICS {
+				"1" {
+					Object.Base.input_audio_format [
+						{
+							in_rate			$DMIC1_RATE
+							in_channels		1
+							in_bit_depth		16
+							in_valid_bit_depth	16
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+							in_ch_map		$CHANNEL_MAP_MONO
+						}
+						{
+							in_rate			$DMIC1_RATE
+							in_channels		1
+							in_bit_depth		32
+							in_valid_bit_depth	24
+							in_sample_type		$SAMPLE_TYPE_MSB_INTEGER
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+							in_ch_map		$CHANNEL_MAP_MONO
+						}
+						{
+							in_rate			$DMIC1_RATE
+							in_channels		1
+							in_bit_depth		32
+							in_valid_bit_depth	32
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+							in_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+					Object.Base.output_audio_format [
+						{
+							out_rate		$DMIC1_RATE
+							out_channels		1
+							out_bit_depth		32
+							out_valid_bit_depth	32
+							out_ch_cfg		$CHANNEL_CONFIG_MONO
+							out_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+				}
 				"2" {
 					Object.Base.input_audio_format [
 						{
@@ -149,6 +210,28 @@ Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
 			num_input_audio_formats	    1
 			num_output_audio_formats    1
 			IncludeByKey.NUM_DMICS {
+				"1" {
+					Object.Base.input_audio_format [
+						{
+							in_rate			$DMIC1_RATE
+							in_channels		1
+							in_bit_depth		32
+							in_valid_bit_depth	32
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+							in_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+					Object.Base.output_audio_format [
+						{
+							out_rate		$DMIC1_RATE
+							out_channels		1
+							out_bit_depth		16
+							out_valid_bit_depth	16
+							out_ch_cfg		$CHANNEL_CONFIG_MONO
+							out_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+				}
 				"2" {
 					Object.Base.input_audio_format [
 						{
@@ -217,6 +300,28 @@ Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
 			num_input_audio_formats	    1
 			num_output_audio_formats    1
 			IncludeByKey.NUM_DMICS {
+				"1" {
+					Object.Base.input_audio_format [
+						{
+							in_rate			$DMIC1_RATE
+							in_channels		1
+							in_bit_depth		32
+							in_valid_bit_depth	32
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+							in_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+					Object.Base.output_audio_format [
+						{
+							out_rate		$DMIC1_RATE
+							out_channels		1
+							out_bit_depth		32
+							out_valid_bit_depth	32
+							out_ch_cfg		$CHANNEL_CONFIG_MONO
+							out_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+				}
 				"2" {
 					Object.Base.input_audio_format [
 						{
@@ -265,6 +370,28 @@ Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
 			num_input_audio_formats	    1
 			num_output_audio_formats    1
 			IncludeByKey.NUM_DMICS {
+				"1" {
+					Object.Base.input_audio_format [
+						{
+							in_rate			$DMIC1_RATE
+							in_channels		1
+							in_bit_depth		32
+							in_valid_bit_depth	32
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+							in_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+					Object.Base.output_audio_format [
+						{
+							out_rate		$DMIC1_RATE
+							out_channels		1
+							out_bit_depth		32
+							out_valid_bit_depth	32
+							out_ch_cfg		$CHANNEL_CONFIG_MONO
+							out_ch_map		$CHANNEL_MAP_MONO
+						}
+					]
+				}
 				"2" {
 					Object.Base.input_audio_format [
 						{
@@ -334,6 +461,30 @@ Object.Widget.mfcc.1 {
 		}
 	}
 	IncludeByKey.NUM_DMICS {
+		"1" {
+			num_input_audio_formats 1
+			Object.Base.input_audio_format [
+				{
+					in_rate			$DMIC1_RATE
+					in_channels		1
+					in_bit_depth		16
+					in_valid_bit_depth	16
+					in_ch_cfg		$CHANNEL_CONFIG_MONO
+					in_ch_map		$CHANNEL_MAP_MONO
+				}
+			]
+			num_output_audio_formats 1
+			Object.Base.output_audio_format [
+				{
+					out_rate		$DMIC1_RATE
+					out_channels		1
+					out_bit_depth		16
+					out_valid_bit_depth	16
+					out_ch_cfg		$CHANNEL_CONFIG_MONO
+					out_ch_map		$CHANNEL_MAP_MONO
+				}
+			]
+		}
 		"2" {
 			num_input_audio_formats 1
 			Object.Base.input_audio_format [