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

topology2: host-copier-gain-mixin-playback: Use host-copier 

Replace the generic copier with host-copier object in the pipeline class
definition and all its instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-05-16 13:30:04 -07:00 committed by Ranjani Sridharan
parent f64a424bfd
commit f211f4c9da
9 changed files with 91 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,9 @@ Object.Pipeline {
{
index 1
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_PLAYBACK_PCM
pcm_id 0
}
Object.Widget.gain.1 {
@ -137,4 +138,8 @@ Object.Base.route [
source 'copier.HDA.4.1'
sink 'copier.host.3.1'
}
{
source 'host-copier.0.playback'
sink 'gain.1.1'
}
]

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

@ -50,8 +50,9 @@ Object.Pipeline {
{
index 1
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_PLAYBACK_PCM
pcm_id 0
}
Object.Widget.gain.1 {
@ -136,4 +137,8 @@ Object.Base.route [
source 'eqiir.4.1'
sink 'copier.host.3.1'
}
{
source 'host-copier.0.playback'
sink 'gain.1.1'
}
]

21
tools/topology/topology2/cavs-nocodec-multicore.conf
View File

@ -120,9 +120,10 @@ Object.Pipeline.host-copier-gain-mixin-playback [
index 1
core $SSP0_CORE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
core_id $SSP0_CORE_ID
stream_name 'SSP0 Playback'
pcm_id 0
}
Object.Widget.gain.1 {
core_id $SSP0_CORE_ID
@ -135,9 +136,10 @@ Object.Pipeline.host-copier-gain-mixin-playback [
index 5
core $SSP2_CORE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
core_id $SSP2_CORE_ID
stream_name 'SSP2 Playback'
pcm_id 2
}
Object.Widget.gain.1 {
core_id $SSP2_CORE_ID
@ -323,6 +325,14 @@ Object.Base.route [
source "copier.SSP.12.1"
sink "copier.host.11.1"
}
{
source 'host-copier.0.playback'
sink 'gain.1.1'
}
{
source 'host-copier.2.playback'
sink 'gain.5.1'
}
]
# There is pinmux conflict between SSP1 and DMIC on MTL RVP,
@ -358,9 +368,10 @@ IncludeByKey.SSP1_ENABLED {
index 3
core $SSP1_CORE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
core_id $SSP1_CORE_ID
stream_name 'SSP1 Playback'
pcm_id 1
}
Object.Widget.gain.1 {
core_id $SSP1_CORE_ID
@ -468,6 +479,10 @@ IncludeByKey.SSP1_ENABLED {
source "copier.SSP.10.1"
sink "copier.host.9.1"
}
{
source 'host-copier.1.playback'
sink 'gain.3.1'
}
]
}
}

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

@ -174,8 +174,9 @@ IncludeByKey.PASSTHROUGH {
{
index 1
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Playback'
pcm_id 0
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
@ -186,8 +187,9 @@ IncludeByKey.PASSTHROUGH {
{
index 5
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP2 Playback'
pcm_id 2
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
@ -875,6 +877,14 @@ IncludeByKey.PASSTHROUGH {
source "copier.SSP.8.1"
sink "smart_amp.2.1"
}
{
source 'host-copier.0.playback'
sink 'gain.1.1'
}
{
source 'host-copier.2.playback'
sink 'gain.5.1'
}
]
}
"true" {
@ -977,8 +987,9 @@ IncludeByKey.SSP1_ENABLED {
{
index 3
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Playback'
pcm_id 1
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
@ -1128,6 +1139,10 @@ IncludeByKey.SSP1_ENABLED {
source "gain.4.1"
sink "copier.SSP.4.1"
}
{
source 'host-copier.1.playback'
sink 'gain.3.1'
}
]
}
"true" {

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

@ -201,8 +201,9 @@ Object.Pipeline {
{
index 1
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name '$HEADSET_PLAYBACK_PCM_STREAM_NAME'
pcm_id 0
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
@ -213,8 +214,9 @@ Object.Pipeline {
{
index 3
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name '$SPEAKER_PLAYBACK_PCM_STREAM_NAME'
pcm_id 1
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
@ -351,4 +353,12 @@ Object.Base.route [
source "copier.SSP.6.1"
sink "copier.host.5.1"
}
{
source "host-copier.0.playback"
sink "gain.1.1"
}
{
source "host-copier.1.playback"
sink "gain.3.1"
}
]

16
tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf
View File

@ -17,7 +17,7 @@
#
<include/common/audio_format.conf>
<include/components/copier.conf>
<include/components/host-copier.conf>
<include/components/mixin.conf>
<include/components/pipeline.conf>
<include/components/gain.conf>
@ -45,12 +45,12 @@ Class.Pipeline."host-copier-gain-mixin-playback" {
}
Object.Widget {
copier."1" {
copier_type "host"
host-copier."1" {
type "aif_in"
node_type $HDA_HOST_OUTPUT_CLASS
num_input_audio_formats 3
num_output_audio_formats 3
num_output_pins 1
# 16-bit 48KHz 2ch
Object.Base.audio_format.1 {
out_bit_depth 32
@ -95,16 +95,12 @@ Class.Pipeline."host-copier-gain-mixin-playback" {
}
}
Object.Base {
route.1 {
source copier.host.$index.1
sink gain.$index.1
}
route.2 {
Object.Base.route [
{
source gain.$index.1
sink mixin.$index.1
}
}
]
direction "playback"
dynamic_pipeline 1

8
tools/topology/topology2/platform/intel/nocodec-ssp0-2level.conf
View File

@ -5,8 +5,9 @@ Object.Pipeline.host-copier-gain-mixin-playback [
Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Aux Playback'
pcm_id $SSP0_MIXER_PCM_ID_1
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
@ -49,6 +50,11 @@ Object.Base.route [
source $SSP0_MIXER_SOURCE_2
sink $SSP0_MIXER_SINK_1
}
{
source host-copier.$SSP0_MIXER_PCM_ID_1.playback
sink gain.$SSP0_MIXER_PIPELINE_ID_2.1
}
{
source $SSP0_MIXER_SOURCE_3
sink $SSP0_MIXER_SINK_2

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

@ -33,8 +33,9 @@ Object.Pipeline {
{
index 20
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name "sdw amplifiers"
pcm_id 2
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
@ -129,6 +130,10 @@ Object.Base.route [
source 'mixin.20.1'
sink 'mixout.21.1'
}
{
source 'host-copier.2.playback'
sink 'gain.20.1'
}
]
IncludeByKey.SDW_AMP_FEEDBACK {

19
tools/topology/topology2/platform/intel/sdw-jack-generic.conf
View File

@ -46,13 +46,14 @@ Object.Pipeline {
{
index 0
Object.Widget.copier.1 {
stream_name "volume playback 0"
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '1 Playback Volume 0'
}
Object.Widget.host-copier.1 {
stream_name "volume playback 0"
pcm_id 0
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '1 Playback Volume 0'
}
}
}
]
@ -156,4 +157,8 @@ Object.Base.route [
source "eqiir.11.1"
sink "copier.host.10.1"
}
{
source "host-copier.0.playback"
sink "gain.0.1"
}
]