Skip to content

Commit 4ecaa95

Browse files
ujfalusikv2019i
authored andcommitted
Tools: Topology2: cavs-nocodec: Fix formats for Port0 first/second capture
The 'Port0' and 'Port0 2nd' branches out at module-copier.8.2, which only supports 32bit in/out format. The two branch on top of it is identical: module-copier.X.2 - 16/32 in/out support gain.X.1 - 16/32 in/out support host-copier.X.capture - 32bit in, and various output formats. In these branches from module-copier.8.2 to the host-copier we cannot have 16bit format, so update the module-copier and gain audio format definitions to reflect this. The current way causes errors if one of the branch is already in use and the second branch is started since the module-copier.8.2 has been already configured, we skip it's configuration but the next copier have multiple formats to be chosen from and this can cause misconfiguration of formats. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 8c20e6b commit 4ecaa95

File tree

1 file changed

+74
-0
lines changed

1 file changed

+74
-0
lines changed

tools/topology/topology2/cavs-nocodec.conf

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,43 @@ IncludeByKey.PASSTHROUGH {
417417
Object.Control.mixer.1 {
418418
name 'Post Demux $SSP0_PCM_NAME Capture Volume'
419419
}
420+
421+
num_input_audio_formats 1
422+
423+
Object.Base.input_audio_format [
424+
# 32-bit 48KHz 2ch
425+
{
426+
in_bit_depth 32
427+
in_valid_bit_depth 32
428+
}
429+
]
430+
431+
num_output_audio_formats 1
432+
Object.Base.output_audio_format [
433+
{
434+
out_bit_depth 32
435+
out_valid_bit_depth 32
436+
}
437+
]
438+
}
439+
Object.Widget.module-copier.2 {
440+
num_input_audio_formats 1
441+
442+
Object.Base.input_audio_format [
443+
# 32-bit 48KHz 2ch
444+
{
445+
in_bit_depth 32
446+
in_valid_bit_depth 32
447+
}
448+
]
449+
450+
num_output_audio_formats 1
451+
Object.Base.output_audio_format [
452+
{
453+
out_bit_depth 32
454+
out_valid_bit_depth 32
455+
}
456+
]
420457
}
421458
}
422459

@@ -432,6 +469,43 @@ IncludeByKey.PASSTHROUGH {
432469
Object.Control.mixer.1 {
433470
name 'Post Demux $SSP0_CAPTURE_PCM Volume'
434471
}
472+
473+
num_input_audio_formats 1
474+
475+
Object.Base.input_audio_format [
476+
# 32-bit 48KHz 2ch
477+
{
478+
in_bit_depth 32
479+
in_valid_bit_depth 32
480+
}
481+
]
482+
483+
num_output_audio_formats 1
484+
Object.Base.output_audio_format [
485+
{
486+
out_bit_depth 32
487+
out_valid_bit_depth 32
488+
}
489+
]
490+
}
491+
Object.Widget.module-copier.2 {
492+
num_input_audio_formats 1
493+
494+
Object.Base.input_audio_format [
495+
# 32-bit 48KHz 2ch
496+
{
497+
in_bit_depth 32
498+
in_valid_bit_depth 32
499+
}
500+
]
501+
502+
num_output_audio_formats 1
503+
Object.Base.output_audio_format [
504+
{
505+
out_bit_depth 32
506+
out_valid_bit_depth 32
507+
}
508+
]
435509
}
436510
}
437511
]

0 commit comments

Comments
 (0)