Skip to content

Commit 1f0d4b0

Browse files
committed
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 f941282 commit 1f0d4b0

1 file changed

Lines changed: 74 additions & 0 deletions

File tree

tools/topology/topology2/cavs-nocodec.conf

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

@@ -429,6 +466,43 @@ IncludeByKey.PASSTHROUGH {
429466
Object.Control.mixer.1 {
430467
name 'Post Demux $SSP0_CAPTURE_PCM Volume'
431468
}
469+
470+
num_input_audio_formats 1
471+
472+
Object.Base.input_audio_format [
473+
# 32-bit 48KHz 2ch
474+
{
475+
in_bit_depth 32
476+
in_valid_bit_depth 32
477+
}
478+
]
479+
480+
num_output_audio_formats 1
481+
Object.Base.output_audio_format [
482+
{
483+
out_bit_depth 32
484+
out_valid_bit_depth 32
485+
}
486+
]
487+
}
488+
Object.Widget.module-copier.2 {
489+
num_input_audio_formats 1
490+
491+
Object.Base.input_audio_format [
492+
# 32-bit 48KHz 2ch
493+
{
494+
in_bit_depth 32
495+
in_valid_bit_depth 32
496+
}
497+
]
498+
499+
num_output_audio_formats 1
500+
Object.Base.output_audio_format [
501+
{
502+
out_bit_depth 32
503+
out_valid_bit_depth 32
504+
}
505+
]
432506
}
433507
}
434508
]

0 commit comments

Comments
 (0)