topology2: Add 4ch audio formats for gain-capture pipeline

Add support in gain-capture pipeline to support 4ch DMIC stream. Signed-off-by: Rander Wang <rander.wang@intel.com>
marc-hb · Sep 25, 2023 · beddfb3 · beddfb3
1 parent e7a1592
commit beddfb3
Showing 1 changed file with 90 additions and 6 deletions.
diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf b/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf
@@ -45,16 +45,23 @@ Class.Pipeline."gain-capture" {
 	Object.Widget {
 		host-copier."1" {
 			type	"aif_out"
-			num_input_audio_formats 1
+			num_input_audio_formats 2
 			num_input_pins 1
 			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
 				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
 			]
 
-			num_output_audio_formats 3
+			num_output_audio_formats 6
 			num_output_pins 1
 			Object.Base.output_audio_format [
 				{
@@ -69,13 +76,34 @@ Class.Pipeline."gain-capture" {
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	24
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
 			]
 
 			node_type $HDA_HOST_INPUT_CLASS
 		}
 
 		gain."1" {
-			num_input_audio_formats 2
+			num_input_audio_formats 4
 			num_input_pins 1
 			Object.Base.input_audio_format [
 				{
@@ -86,9 +114,23 @@ Class.Pipeline."gain-capture" {
 					in_bit_depth		32
 					in_valid_bit_depth	32
 				}
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
 			]
 
-			num_output_audio_formats 2
+			num_output_audio_formats 4
 			num_output_pins 1
 			Object.Base.output_audio_format [
 				{
@@ -99,11 +141,25 @@ Class.Pipeline."gain-capture" {
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
 			]
 		}
 
 		module-copier."2" {
-			num_input_audio_formats 2
+			num_input_audio_formats 4
 			num_input_pins 1
 			Object.Base.input_audio_format [
 				{
@@ -114,9 +170,23 @@ Class.Pipeline."gain-capture" {
 					in_bit_depth		32
 					in_valid_bit_depth	32
 				}
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
 			]
 
-			num_output_audio_formats 2
+			num_output_audio_formats 4
 			num_output_pins 1
 			Object.Base.output_audio_format [
 				{
@@ -127,6 +197,20 @@ Class.Pipeline."gain-capture" {
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
 			]
 		}