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

topology2: cavs-nocodec: add a module copier to SSP 0 capture pipeline 

Add a module copier between the DAI copier and gain in preparation for
optimizing the single endpoint DAI copiers. This optimization will
temporarily make multiple sinks unsupported with DAI copiers. This
feature will be re-introduced in a follow up PR and the module copier
will be removed then.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-04-28 11:29:56 -07:00 committed by Kai Vehmanen
parent 59c343fcc7
commit 74f324641a
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,7 +213,7 @@ Object.Pipeline.mixout-gain-smart-amp-dai-copier-playback [
} }
Object.Base.input_pin_binding.2 { Object.Base.input_pin_binding.2 {
input_pin_binding_name "copier.SSP.8.1" input_pin_binding_name "module-copier.8.1"
} }
Object.Control.bytes."1" { Object.Control.bytes."1" {
@ -345,7 +345,9 @@ Object.Pipeline.dai-copier-gain-module-copier-capture [
out_bit_depth 32 out_bit_depth 32
out_valid_bit_depth 32 out_valid_bit_depth 32
} }
}
Object.Widget.module-copier.1 {
Object.Base.output_pin_binding.1 { Object.Base.output_pin_binding.1 {
output_pin_binding_name "gain.8.1" output_pin_binding_name "gain.8.1"
} }
@ -634,7 +636,7 @@ Object.Base.route [
} }
{ {
source "copier.SSP.8.1" source "copier.SSP.8.1"
sink "gain.8.1" sink "module-copier.8.1"
} }
{ {
source "copier.SSP.12.1" source "copier.SSP.12.1"
@ -661,7 +663,7 @@ Object.Base.route [
sink gain.20.1 sink gain.20.1
} }
{ {
source "copier.SSP.8.1" source "module-copier.8.1"
sink "smart_amp.2.1" sink "smart_amp.2.1"
} }
] ]

14
tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf
View File

@ -57,6 +57,16 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" {
out_valid_bit_depth 32 out_valid_bit_depth 32
} }
} }
module-copier."1" {
num_input_audio_formats 1
num_output_audio_formats 1
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
out_bit_depth 32
out_valid_bit_depth 32
}
}
module-copier."2" { module-copier."2" {
num_input_audio_formats 1 num_input_audio_formats 1
@ -92,6 +102,10 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" {
source gain.$index.1 source gain.$index.1
sink module-copier.$index.2 sink module-copier.$index.2
} }
route.2 {
source module-copier.$index.1
sink gain.$index.1
}
} }
direction "capture" direction "capture"