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

topology2: host-gateway-capture: use host-copier 

Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-05-16 14:36:13 -07:00 committed by Ranjani Sridharan
parent 81a354e750
commit ac26e70d95
17 changed files with 91 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,9 @@ Object.Pipeline {
host-gateway-capture [
{
index 3
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_CAPTURE_PCM
pcm_id 0
}
}
]
@ -136,7 +137,7 @@ Object.Base.route [
}
{
source 'copier.HDA.4.1'
sink 'copier.host.3.1'
sink 'host-copier.0.capture'
}
{
source 'host-copier.0.playback'

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

@ -66,8 +66,9 @@ Object.Pipeline {
host-gateway-capture [
{
index 3
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_CAPTURE_PCM
pcm_id 0
}
}
]
@ -135,7 +136,7 @@ Object.Base.route [
}
{
source 'eqiir.4.1'
sink 'copier.host.3.1'
sink 'host-copier.0.capture'
}
{
source 'host-copier.0.playback'

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

@ -183,8 +183,9 @@ Object.Pipeline {
Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Capture'
pcm_id 0
}
}
{
@ -192,8 +193,9 @@ Object.Pipeline {
Object.Widget.pipeline.1 {
stream_name 'NoCodec-1'
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Capture'
pcm_id 1
}
}
]
@ -300,10 +302,10 @@ Object.Base.route [
}
{
source "copier.SSP.6.1"
sink "copier.host.5.1"
sink "host-copier.0.capture"
}
{
source "copier.SSP.10.1"
sink "copier.host.9.1"
sink "host-copier.1.capture"
}
]

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

@ -203,15 +203,17 @@ Object.Pipeline.host-gateway-capture [
{
index 7
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Capture'
pcm_id 0
}
}
{
index 11
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP2 Capture'
pcm_id 2
}
}
]
@ -319,11 +321,11 @@ Object.Base.route [
}
{
source "copier.SSP.8.1"
sink "copier.host.7.1"
sink "host-copier.0.capture"
}
{
source "copier.SSP.12.1"
sink "copier.host.11.1"
sink "host-copier.2.capture"
}
{
source 'host-copier.0.playback'
@ -415,8 +417,9 @@ IncludeByKey.SSP1_ENABLED {
{
index 9
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Capture'
pcm_id 1
}
}
]
@ -477,7 +480,7 @@ IncludeByKey.SSP1_ENABLED {
}
{
source "copier.SSP.10.1"
sink "copier.host.9.1"
sink "host-copier.1.capture"
}
{
source 'host-copier.1.playback'

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

@ -552,8 +552,9 @@ IncludeByKey.PASSTHROUGH {
{
index 7
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Capture'
pcm_id 0
}
}
]
@ -594,8 +595,9 @@ Object.Pipeline.host-gateway-capture [
{
index 11
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP2 Capture'
pcm_id 2
}
}
]
@ -834,7 +836,7 @@ IncludeByKey.PASSTHROUGH {
Object.Base.route [
{
source "copier.SSP.12.1"
sink "copier.host.11.1"
sink "host-copier.2.capture"
}
]
@ -911,7 +913,7 @@ IncludeByKey.PASSTHROUGH {
Object.Base.route [
{
source "copier.SSP.8.1"
sink "copier.host.7.1"
sink "host-copier.0.capture"
}
{
source "copier.host.1.1"
@ -995,8 +997,9 @@ IncludeByKey.SSP1_ENABLED {
{
index 9
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Capture'
pcm_id 1
}
}
]
@ -1177,7 +1180,7 @@ IncludeByKey.SSP1_ENABLED {
Object.Base.route [
{
source "copier.SSP.10.1"
sink "copier.host.9.1"
sink "host-copier.1.capture"
}
]
}

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

@ -267,8 +267,9 @@ Object.Pipeline {
{
index 5
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name '$HEADSET_CAPTURE_PCM_STREAM_NAME'
pcm_id 0
}
}
]
@ -351,7 +352,7 @@ Object.Base.route [
}
{
source "copier.SSP.6.1"
sink "copier.host.5.1"
sink "host-copier.0.capture"
}
{
source "host-copier.0.playback"

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

@ -117,11 +117,14 @@ Object.Pipeline {
{
index 4
Object.Widget.copier.1.stream_name "Passthrough Capture 0"
Object.Widget.copier.1.Object.Base.audio_format.1 {
# 32 -> 16 bits conversion is done here,
# so in_bit_depth is 32 (and out_bit_depth is 16).
in_bit_depth 32
Object.Widget.host-copier.1 {
stream_name "Passthrough Capture 0"
pcm_id 1
Object.Base.audio_format.1 {
# 32 -> 16 bits conversion is done here,
# so in_bit_depth is 32 (and out_bit_depth is 16).
in_bit_depth 32
}
}
}
]
@ -184,7 +187,7 @@ Object.Base.route [
}
{
source "copier.ALH.3.1"
sink "copier.host.4.1"
sink "host-copier.1.capture"
}
{
source 'host-copier.0.playback'

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

@ -69,8 +69,9 @@ Object.Pipeline {
host-gateway-capture [
{
index 3
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_CAPTURE_PCM
pcm_id 0
}
}
]
@ -131,7 +132,7 @@ Object.Base.route [
}
{
source 'copier.HDA.4.1'
sink 'copier.host.3.1'
sink 'host-copier.0.capture'
}
{
source 'host-copier.0.playback'

6
tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf
View File

@ -17,7 +17,7 @@
#
<include/common/audio_format.conf>
<include/components/copier.conf>
<include/components/host-copier.conf>
<include/components/pipeline.conf>
Class.Pipeline."host-gateway-capture" {
@ -43,10 +43,10 @@ Class.Pipeline."host-gateway-capture" {
}
Object.Widget {
copier."1" {
copier_type "host"
host-copier."1" {
type "aif_out"
node_type $HDA_HOST_INPUT_CLASS
num_input_pins 1
num_input_audio_formats 6
num_output_audio_formats 6
# 16-bit output format 48KHz 2ch. Input sample format is always 32-bit for capture

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

@ -105,8 +105,9 @@ Object.Pipeline {
Object.Widget.pipeline.1 {
stream_name $BT_CP_PIPELINE_STREAM_NAME
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $BT_CP_PCM_CAPS
pcm_id $BT_PCM_ID
num_input_audio_formats 3
num_output_audio_formats 3
Object.Base.audio_format.0 {
@ -198,7 +199,7 @@ Object.Base.route [
}
{
source $BT_CP_DAI_PIPELINE_SRC
sink $BT_CP_HOST_PIPELINE_SINK
sink "host-copier.$BT_PCM_ID.capture"
}
]

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

@ -259,8 +259,9 @@ IncludeByKey.PASSTHROUGH {
Object.Pipeline.host-gateway-capture [
{
index $DMIC0_HOST_PIPELINE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $DMIC0_PCM_CAPS
pcm_id $DMIC0_PCM_ID
num_input_audio_formats 2
Object.Base.input_audio_format [
{
@ -336,7 +337,7 @@ IncludeByKey.PASSTHROUGH {
Object.Base.route [
{
source "copier.DMIC.$DMIC0_DAI_PIPELINE_ID.1"
sink "copier.host.$DMIC0_HOST_PIPELINE_ID.1"
sink "host-copier.$DMIC0_PCM_ID.capture"
}
]
}

7
tools/topology/topology2/platform/intel/dmic-wov.conf
View File

@ -7,8 +7,9 @@ Object.Pipeline {
rate_max 16000
index $DMIC1_HOST_PIPELINE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $DMIC1_PCM_CAPS
pcm_id 11
Object.Base.audio_format.1 {
in_rate 16000
in_bit_depth 32
@ -108,7 +109,7 @@ Object.Pipeline {
Object.Base.route [
{
source $DMIC_WOV_DAI_PIPELINE_KPB
sink $DMIC1_HOST_PIPELINE_SINK
sink "host-copier.11.capture"
}
{
source $DMIC_WOV_DAI_PIPELINE_KPB
@ -116,7 +117,7 @@ Object.Base.route [
}
{
source $WOV_PIPELINE_VIRTUAL
sink $DMIC1_HOST_PIPELINE_SINK
sink "host-copier.11.capture"
}
]

5
tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf
View File

@ -21,8 +21,9 @@ Object.Pipeline.host-gateway-capture[
{
index 19
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name "DMIC0 AEC"
pcm_id 27
}
}
]
@ -90,7 +91,7 @@ Object.Base.route [
}
{
source "module-copier.18.2"
sink "copier.host.19.1"
sink "host-copier.27.capture"
}
{
source "module-copier.18.2"

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

@ -159,11 +159,14 @@ IncludeByKey.SDW_AMP_FEEDBACK {
{
index 30
Object.Widget.copier.1.stream_name "amp feedback"
Object.Widget.copier.1.Object.Base.audio_format.1 {
# 32 -> 16 bits conversion is done here,
# so in_bit_depth is 32 (and out_bit_depth is 16).
in_bit_depth 32
Object.Widget.host-copier.1 {
stream_name "amp feedback"
pcm_id 3
Object.Base.audio_format.1 {
# 32 -> 16 bits conversion is done here,
# so in_bit_depth is 32 (and out_bit_depth is 16).
in_bit_depth 32
}
}
}
]
@ -226,7 +229,7 @@ IncludeByKey.SDW_AMP_FEEDBACK {
Object.Base.route [
{
source "copier.ALH.31.1"
sink "copier.host.30.1"
sink "host-copier.3.capture"
}
]
}

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

@ -27,11 +27,14 @@ Object.Pipeline {
{
index 40
Object.Widget.copier.1.stream_name "sdw dmic"
Object.Widget.copier.1.Object.Base.audio_format.1 {
# 32 -> 16 bits conversion is done here,
# so in_bit_depth is 32 (and out_bit_depth is 16).
in_bit_depth 32
Object.Widget.host-copier.1 {
stream_name "sdw dmic"
pcm_id 4
Object.Base.audio_format.1 {
# 32 -> 16 bits conversion is done here,
# so in_bit_depth is 32 (and out_bit_depth is 16).
in_bit_depth 32
}
}
}
]
@ -70,6 +73,6 @@ Object.PCM.pcm [
Object.Base.route [
{
source "copier.ALH.41.1"
sink "copier.host.40.1"
sink "host-copier.4.capture"
}
]

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

@ -80,11 +80,14 @@ Object.Pipeline {
{
index 10
Object.Widget.copier.1.stream_name "Passthrough Capture 0"
Object.Widget.copier.1.Object.Base.audio_format.1 {
# 32/32 -> 16/16 bits conversion is done here
in_bit_depth 32
in_valid_bit_depth 32
Object.Widget.host-copier.1 {
stream_name "Passthrough Capture 0"
pcm_id 1
Object.Base.audio_format.1 {
# 32/32 -> 16/16 bits conversion is done here
in_bit_depth 32
in_valid_bit_depth 32
}
}
}
]
@ -155,7 +158,7 @@ Object.Base.route [
}
{
source "eqiir.11.1"
sink "copier.host.10.1"
sink "host-copier.1.capture"
}
{
source "host-copier.0.playback"

5
tools/topology/topology2/platform/intel/speaker-echo-ref.conf
View File

@ -7,8 +7,9 @@ Object.Pipeline {
{
index $ECHO_REF_HOST_PIPELINE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ECHO_REF_STREAM_NAME
pcm_id 27
}
}
]
@ -56,6 +57,6 @@ Object.Base.route [
}
{
source $ECHO_REF_COPIER_MODULE
sink $ECHO_REF_HOST_PIPELINE_SINK
sink "host-copier.27.capture"
}
]