Skip to content

Commit beddfb3

Browse files
RanderWanglgirdwood
authored andcommitted
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>
1 parent e7a1592 commit beddfb3

File tree

1 file changed

+90
-6
lines changed

1 file changed

+90
-6
lines changed

tools/topology/topology2/include/pipelines/cavs/gain-capture.conf

Lines changed: 90 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,23 @@ Class.Pipeline."gain-capture" {
4545
Object.Widget {
4646
host-copier."1" {
4747
type "aif_out"
48-
num_input_audio_formats 1
48+
num_input_audio_formats 2
4949
num_input_pins 1
5050
Object.Base.input_audio_format [
5151
{
5252
in_bit_depth 32
5353
in_valid_bit_depth 32
5454
}
55+
{
56+
in_bit_depth 32
57+
in_valid_bit_depth 32
58+
in_channels 4
59+
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
60+
in_ch_map $CHANNEL_MAP_3_POINT_1
61+
}
5562
]
5663

57-
num_output_audio_formats 3
64+
num_output_audio_formats 6
5865
num_output_pins 1
5966
Object.Base.output_audio_format [
6067
{
@@ -69,13 +76,34 @@ Class.Pipeline."gain-capture" {
6976
out_bit_depth 32
7077
out_valid_bit_depth 32
7178
}
79+
{
80+
out_bit_depth 16
81+
out_valid_bit_depth 16
82+
out_channels 4
83+
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
84+
out_ch_map $CHANNEL_MAP_3_POINT_1
85+
}
86+
{
87+
out_bit_depth 32
88+
out_valid_bit_depth 24
89+
out_channels 4
90+
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
91+
out_ch_map $CHANNEL_MAP_3_POINT_1
92+
}
93+
{
94+
out_bit_depth 32
95+
out_valid_bit_depth 32
96+
out_channels 4
97+
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
98+
out_ch_map $CHANNEL_MAP_3_POINT_1
99+
}
72100
]
73101

74102
node_type $HDA_HOST_INPUT_CLASS
75103
}
76104

77105
gain."1" {
78-
num_input_audio_formats 2
106+
num_input_audio_formats 4
79107
num_input_pins 1
80108
Object.Base.input_audio_format [
81109
{
@@ -86,9 +114,23 @@ Class.Pipeline."gain-capture" {
86114
in_bit_depth 32
87115
in_valid_bit_depth 32
88116
}
117+
{
118+
in_bit_depth 16
119+
in_valid_bit_depth 16
120+
in_channels 4
121+
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
122+
in_ch_map $CHANNEL_MAP_3_POINT_1
123+
}
124+
{
125+
in_bit_depth 32
126+
in_valid_bit_depth 32
127+
in_channels 4
128+
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
129+
in_ch_map $CHANNEL_MAP_3_POINT_1
130+
}
89131
]
90132

91-
num_output_audio_formats 2
133+
num_output_audio_formats 4
92134
num_output_pins 1
93135
Object.Base.output_audio_format [
94136
{
@@ -99,11 +141,25 @@ Class.Pipeline."gain-capture" {
99141
out_bit_depth 32
100142
out_valid_bit_depth 32
101143
}
144+
{
145+
out_bit_depth 16
146+
out_valid_bit_depth 16
147+
out_channels 4
148+
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
149+
out_ch_map $CHANNEL_MAP_3_POINT_1
150+
}
151+
{
152+
out_bit_depth 32
153+
out_valid_bit_depth 32
154+
out_channels 4
155+
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
156+
out_ch_map $CHANNEL_MAP_3_POINT_1
157+
}
102158
]
103159
}
104160

105161
module-copier."2" {
106-
num_input_audio_formats 2
162+
num_input_audio_formats 4
107163
num_input_pins 1
108164
Object.Base.input_audio_format [
109165
{
@@ -114,9 +170,23 @@ Class.Pipeline."gain-capture" {
114170
in_bit_depth 32
115171
in_valid_bit_depth 32
116172
}
173+
{
174+
in_bit_depth 16
175+
in_valid_bit_depth 16
176+
in_channels 4
177+
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
178+
in_ch_map $CHANNEL_MAP_3_POINT_1
179+
}
180+
{
181+
in_bit_depth 32
182+
in_valid_bit_depth 32
183+
in_channels 4
184+
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
185+
in_ch_map $CHANNEL_MAP_3_POINT_1
186+
}
117187
]
118188

119-
num_output_audio_formats 2
189+
num_output_audio_formats 4
120190
num_output_pins 1
121191
Object.Base.output_audio_format [
122192
{
@@ -127,6 +197,20 @@ Class.Pipeline."gain-capture" {
127197
out_bit_depth 32
128198
out_valid_bit_depth 32
129199
}
200+
{
201+
out_bit_depth 16
202+
out_valid_bit_depth 16
203+
out_channels 4
204+
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
205+
out_ch_map $CHANNEL_MAP_3_POINT_1
206+
}
207+
{
208+
out_bit_depth 32
209+
out_valid_bit_depth 32
210+
out_channels 4
211+
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
212+
out_ch_map $CHANNEL_MAP_3_POINT_1
213+
}
130214
]
131215
}
132216

0 commit comments

Comments
 (0)