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

topology2: add core id macros for echo ref & EC pipelines 

Add macros in preparation to run RTC AEC on secondary core

Signed-off-by: Yong Zhi <yong.zhi@intel.com>
This commit is contained in:
Yong Zhi 2023-08-09 04:25:09 -05:00 committed by Liam Girdwood
parent ad2f035c06
commit aec3bfdb77
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,7 @@ Define {
ECHO_REF_DAI_PIPELINE_ID 8 ECHO_REF_DAI_PIPELINE_ID 8
ECHO_REF_COPIER_MODULE 'module-copier.8.2' ECHO_REF_COPIER_MODULE 'module-copier.8.2'
ECHO_REF_PCM_ID 29 ECHO_REF_PCM_ID 29
ECHO_REF_CORE_ID 0
# override BT default definitions # override BT default definitions
BT_PB_HOST_PIPELINE_ID 9 BT_PB_HOST_PIPELINE_ID 9
BT_PB_DAI_PIPELINE_ID 10 BT_PB_DAI_PIPELINE_ID 10
@ -96,6 +97,7 @@ Define {
BT_PB_PIPELINE_STREAM_NAME "dai-copier.SSP.10.1" BT_PB_PIPELINE_STREAM_NAME "dai-copier.SSP.10.1"
GOOGLE_RTC_AEC_SUPPORT 0 GOOGLE_RTC_AEC_SUPPORT 0
GOOGLE_RTC_AEC_REF_SOURCE 'module-copier.8.2' GOOGLE_RTC_AEC_REF_SOURCE 'module-copier.8.2'
GOOGLE_AEC_CORE_ID 0
HEADSET_PCM_NAME "Headset" HEADSET_PCM_NAME "Headset"
SPEAKER_PCM_NAME "Speakers" SPEAKER_PCM_NAME "Speakers"
INCLUDE_BT_OFFLOAD true INCLUDE_BT_OFFLOAD true

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

@ -1,8 +1,11 @@
Object.Pipeline.google-rtc-aec-capture [ Object.Pipeline.google-rtc-aec-capture [
{ {
index 18 index 18
core_id $GOOGLE_AEC_CORE_ID
Object.Widget.pipeline.1 { Object.Widget.pipeline.1 {
stream_name "DMIC0 RTC AEC" stream_name "DMIC0 RTC AEC"
core $GOOGLE_AEC_CORE_ID
} }
Object.Widget.google-rtc-aec.1 { Object.Widget.google-rtc-aec.1 {
@ -20,17 +23,22 @@ Object.Pipeline.google-rtc-aec-capture [
Object.Pipeline.host-gateway-capture[ Object.Pipeline.host-gateway-capture[
{ {
index 19 index 19
core_id $GOOGLE_AEC_CORE_ID
Object.Widget.host-copier.1 { Object.Widget.host-copier.1 {
stream_name "DMIC0 AEC" stream_name "DMIC0 AEC"
pcm_id 27 pcm_id 27
} }
Object.Widget.pipeline."1" {
core $GOOGLE_AEC_CORE_ID
}
} }
] ]
Object.Pipeline.gain-capture [ Object.Pipeline.gain-capture [
{ {
index 20 index 20
core_id $GOOGLE_AEC_CORE_ID
Object.Widget.host-copier.1 { Object.Widget.host-copier.1 {
stream_name "DMIC0 AN" stream_name "DMIC0 AN"
@ -42,6 +50,9 @@ Object.Pipeline.gain-capture [
name 'AN Volume' name 'AN Volume'
} }
} }
Object.Widget.pipeline."1" {
core $GOOGLE_AEC_CORE_ID
}
} }
] ]

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

@ -6,20 +6,27 @@ Object.Pipeline {
host-gateway-capture [ host-gateway-capture [
{ {
index $ECHO_REF_HOST_PIPELINE_ID index $ECHO_REF_HOST_PIPELINE_ID
core_id $ECHO_REF_CORE_ID
Object.Widget.host-copier.1 { Object.Widget.host-copier.1 {
core_id $ECHO_REF_CORE_ID
stream_name $ECHO_REF_STREAM_NAME stream_name $ECHO_REF_STREAM_NAME
pcm_id $ECHO_REF_PCM_ID pcm_id $ECHO_REF_PCM_ID
} }
Object.Widget.pipeline."1" {
core $ECHO_REF_CORE_ID
}
} }
] ]
dai-copier-be [ dai-copier-be [
{ {
index $ECHO_REF_DAI_PIPELINE_ID index $ECHO_REF_DAI_PIPELINE_ID
core_id $ECHO_REF_CORE_ID
direction "capture" direction "capture"
Object.Widget.dai-copier."1" { Object.Widget.dai-copier."1" {
core_id $ECHO_REF_CORE_ID
dai_index $SPEAKER_SSP_DAI_INDEX dai_index $SPEAKER_SSP_DAI_INDEX
dai_type "SSP" dai_type "SSP"
type dai_out type dai_out
@ -33,6 +40,9 @@ Object.Pipeline {
out_valid_bit_depth 32 out_valid_bit_depth 32
} }
} }
Object.Widget.pipeline."1" {
core $ECHO_REF_CORE_ID
}
} }
] ]
} }