OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology2: use passthrough-capture-be instead of passthrough-be 

As the copier can do format conversions, and many pipeline components
can do conversions as well, it is important for the topology to define a
single format to use in the "dai_out" copier. This ensures deterministic
behaviour with the driver.

Implement this behaviour by switching topologies to use the
passthrough-capture-be pipeline as template for the backend capture
pipelines.

The previously used passthrough-be template is problematic as
the base class already defines multiple audio formats, with multiple
different sample formats. The new passthrough-capture-be only defines
one sample format by default and is a better starting point as a base
class.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2023-02-14 15:01:57 +02:00 committed by Kai Vehmanen
parent a62fa8e418
commit cfeaceb394
10 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/topology/topology2/cavs-mixin-mixout-hda.conf
View File

@ -63,7 +63,7 @@ Object.Pipeline {
}
}
passthrough-be.1 {
passthrough-capture-be.1 {
index 4
direction capture

5
tools/topology/topology2/cavs-nocodec-bt.conf
View File

@ -13,6 +13,7 @@
<passthrough-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
@ -175,7 +176,7 @@ Object.Pipeline {
}
}
passthrough-be.4 {
passthrough-capture-be.4 {
index 6
direction capture
Object.Widget.pipeline.1 {
@ -209,7 +210,7 @@ Object.Pipeline {
}
}
passthrough-be.5 {
passthrough-capture-be.5 {
index 10
direction capture
Object.Widget.pipeline.1 {

6
tools/topology/topology2/cavs-nocodec.conf
View File

@ -11,7 +11,7 @@
<tokens.conf>
<virtual.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<dai-kpb-be.conf>
<wov-detect.conf>
<host-copier-gain-mixin-playback.conf>
@ -405,7 +405,7 @@ Object.Pipeline {
}
}
passthrough-be.5 {
passthrough-capture-be.5 {
index 10
direction capture
@ -434,7 +434,7 @@ Object.Pipeline {
}
}
passthrough-be.6 {
passthrough-capture-be.6 {
index 12
direction capture

3
tools/topology/topology2/cavs-rt5682.conf
View File

@ -13,6 +13,7 @@
<passthrough-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<host-copier-gain-mixin-playback.conf>
<mixout-gain-dai-copier-playback.conf>
<deepbuffer-playback.conf>
@ -248,7 +249,7 @@ Object.Pipeline {
}
}
passthrough-be.1 {
passthrough-capture-be.1 {
index 6
direction capture

4
tools/topology/topology2/cavs-sdw-src-gain-mixin.conf
View File

@ -12,7 +12,7 @@
<src-gain-mixin-playback.conf>
<mixout-gain-dai-copier-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
@ -114,7 +114,7 @@ Object.Pipeline {
in_bit_depth 32
}
}
passthrough-be.2 {
passthrough-capture-be.2 {
direction "capture"
index 3
copier_type "ALH"

3
tools/topology/topology2/cavs-sdw.conf
View File

@ -18,6 +18,7 @@
<passthrough-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
@ -179,7 +180,7 @@ Object.Pipeline {
in_bit_depth 32
}
}
passthrough-be.11 {
passthrough-capture-be.11 {
direction "capture"
index 11
copier_type "ALH"

2
tools/topology/topology2/platform/intel/bt-generic.conf
View File

@ -147,7 +147,7 @@ Object.Pipeline {
}
}
passthrough-be.6 {
passthrough-capture-be.6 {
index $BT_CP_DAI_PIPELINE_ID
direction "capture"
Object.Widget.pipeline.1 {

2
tools/topology/topology2/platform/intel/sdw-amp-generic.conf
View File

@ -115,7 +115,7 @@ IncludeByKey.NUM_SDW_AMPS {
node_type $ALH_LINK_OUTPUT_CLASS
}
}
passthrough-be.$ALH_2ND_SPK_IN_ID {
passthrough-capture-be.$ALH_2ND_SPK_IN_ID {
direction "capture"
index $ALH_2ND_SPK_IN_ID
copier_type "ALH"

2
tools/topology/topology2/platform/intel/sdw-dmic-generic.conf
View File

@ -33,7 +33,7 @@ Object.Pipeline {
in_bit_depth 32
}
}
passthrough-be.41 {
passthrough-capture-be.41 {
direction "capture"
index 41
copier_type "ALH"

1
tools/topology/topology2/sof-hda-generic.conf
View File

@ -19,6 +19,7 @@
<gain-capture.conf>
<deepbuffer-playback.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>