Skip to content

Commit a23cb15

Browse files
singalsukv2019i
singalsu
authored and
kv2019i
committed
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]>
1 parent 03dd361 commit a23cb15

File tree

1 file changed

+151
-0
lines changed

1 file changed

+151
-0
lines changed

Diff for: ‎tools/topology/topology2/platform/intel/dmic1-mfcc.conf

+151
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,28 @@ Object.Pipeline.host-gateway-capture [
1414
num_input_audio_formats 1
1515
num_output_audio_formats 1
1616
IncludeByKey.NUM_DMICS {
17+
"1" {
18+
Object.Base.input_audio_format [
19+
{
20+
in_rate $DMIC1_RATE
21+
in_channels 1
22+
in_bit_depth 16
23+
in_valid_bit_depth 16
24+
in_ch_cfg $CHANNEL_CONFIG_MONO
25+
in_ch_map $CHANNEL_MAP_MONO
26+
}
27+
]
28+
Object.Base.output_audio_format [
29+
{
30+
out_rate $DMIC1_RATE
31+
out_channels 1
32+
out_bit_depth 16
33+
out_valid_bit_depth 16
34+
out_ch_cfg $CHANNEL_CONFIG_MONO
35+
out_ch_map $CHANNEL_MAP_MONO
36+
}
37+
]
38+
}
1739
"2" {
1840
Object.Base.input_audio_format [
1941
{
@@ -75,6 +97,45 @@ Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
7597
num_input_audio_formats 3
7698
num_output_audio_formats 1
7799
IncludeByKey.NUM_DMICS {
100+
"1" {
101+
Object.Base.input_audio_format [
102+
{
103+
in_rate $DMIC1_RATE
104+
in_channels 1
105+
in_bit_depth 16
106+
in_valid_bit_depth 16
107+
in_ch_cfg $CHANNEL_CONFIG_MONO
108+
in_ch_map $CHANNEL_MAP_MONO
109+
}
110+
{
111+
in_rate $DMIC1_RATE
112+
in_channels 1
113+
in_bit_depth 32
114+
in_valid_bit_depth 24
115+
in_sample_type $SAMPLE_TYPE_MSB_INTEGER
116+
in_ch_cfg $CHANNEL_CONFIG_MONO
117+
in_ch_map $CHANNEL_MAP_MONO
118+
}
119+
{
120+
in_rate $DMIC1_RATE
121+
in_channels 1
122+
in_bit_depth 32
123+
in_valid_bit_depth 32
124+
in_ch_cfg $CHANNEL_CONFIG_MONO
125+
in_ch_map $CHANNEL_MAP_MONO
126+
}
127+
]
128+
Object.Base.output_audio_format [
129+
{
130+
out_rate $DMIC1_RATE
131+
out_channels 1
132+
out_bit_depth 32
133+
out_valid_bit_depth 32
134+
out_ch_cfg $CHANNEL_CONFIG_MONO
135+
out_ch_map $CHANNEL_MAP_MONO
136+
}
137+
]
138+
}
78139
"2" {
79140
Object.Base.input_audio_format [
80141
{
@@ -149,6 +210,28 @@ Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
149210
num_input_audio_formats 1
150211
num_output_audio_formats 1
151212
IncludeByKey.NUM_DMICS {
213+
"1" {
214+
Object.Base.input_audio_format [
215+
{
216+
in_rate $DMIC1_RATE
217+
in_channels 1
218+
in_bit_depth 32
219+
in_valid_bit_depth 32
220+
in_ch_cfg $CHANNEL_CONFIG_MONO
221+
in_ch_map $CHANNEL_MAP_MONO
222+
}
223+
]
224+
Object.Base.output_audio_format [
225+
{
226+
out_rate $DMIC1_RATE
227+
out_channels 1
228+
out_bit_depth 16
229+
out_valid_bit_depth 16
230+
out_ch_cfg $CHANNEL_CONFIG_MONO
231+
out_ch_map $CHANNEL_MAP_MONO
232+
}
233+
]
234+
}
152235
"2" {
153236
Object.Base.input_audio_format [
154237
{
@@ -217,6 +300,28 @@ Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
217300
num_input_audio_formats 1
218301
num_output_audio_formats 1
219302
IncludeByKey.NUM_DMICS {
303+
"1" {
304+
Object.Base.input_audio_format [
305+
{
306+
in_rate $DMIC1_RATE
307+
in_channels 1
308+
in_bit_depth 32
309+
in_valid_bit_depth 32
310+
in_ch_cfg $CHANNEL_CONFIG_MONO
311+
in_ch_map $CHANNEL_MAP_MONO
312+
}
313+
]
314+
Object.Base.output_audio_format [
315+
{
316+
out_rate $DMIC1_RATE
317+
out_channels 1
318+
out_bit_depth 32
319+
out_valid_bit_depth 32
320+
out_ch_cfg $CHANNEL_CONFIG_MONO
321+
out_ch_map $CHANNEL_MAP_MONO
322+
}
323+
]
324+
}
220325
"2" {
221326
Object.Base.input_audio_format [
222327
{
@@ -265,6 +370,28 @@ Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
265370
num_input_audio_formats 1
266371
num_output_audio_formats 1
267372
IncludeByKey.NUM_DMICS {
373+
"1" {
374+
Object.Base.input_audio_format [
375+
{
376+
in_rate $DMIC1_RATE
377+
in_channels 1
378+
in_bit_depth 32
379+
in_valid_bit_depth 32
380+
in_ch_cfg $CHANNEL_CONFIG_MONO
381+
in_ch_map $CHANNEL_MAP_MONO
382+
}
383+
]
384+
Object.Base.output_audio_format [
385+
{
386+
out_rate $DMIC1_RATE
387+
out_channels 1
388+
out_bit_depth 32
389+
out_valid_bit_depth 32
390+
out_ch_cfg $CHANNEL_CONFIG_MONO
391+
out_ch_map $CHANNEL_MAP_MONO
392+
}
393+
]
394+
}
268395
"2" {
269396
Object.Base.input_audio_format [
270397
{
@@ -334,6 +461,30 @@ Object.Widget.mfcc.1 {
334461
}
335462
}
336463
IncludeByKey.NUM_DMICS {
464+
"1" {
465+
num_input_audio_formats 1
466+
Object.Base.input_audio_format [
467+
{
468+
in_rate $DMIC1_RATE
469+
in_channels 1
470+
in_bit_depth 16
471+
in_valid_bit_depth 16
472+
in_ch_cfg $CHANNEL_CONFIG_MONO
473+
in_ch_map $CHANNEL_MAP_MONO
474+
}
475+
]
476+
num_output_audio_formats 1
477+
Object.Base.output_audio_format [
478+
{
479+
out_rate $DMIC1_RATE
480+
out_channels 1
481+
out_bit_depth 16
482+
out_valid_bit_depth 16
483+
out_ch_cfg $CHANNEL_CONFIG_MONO
484+
out_ch_map $CHANNEL_MAP_MONO
485+
}
486+
]
487+
}
337488
"2" {
338489
num_input_audio_formats 1
339490
Object.Base.input_audio_format [

0 commit comments

Comments
 (0)