[TEST] topology2: Add Google AEC to core1

Signed-off-by: Yong Zhi <yong.zhi@intel.com>
yongzhi1 · Jul 20, 2023 · 9931f39 · 9931f39
1 parent 3a81870
commit 9931f39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
@@ -89,15 +89,15 @@ Define {
 	ECHO_REF_DAI_PIPELINE_ID	8
 	ECHO_REF_COPIER_MODULE		'module-copier.8.2'
 	ECHO_REF_PCM_ID			29
-	ECHO_REF_CORE_ID		0
+	ECHO_REF_CORE_ID		1
 	# override BT default definitions
 	BT_PB_HOST_PIPELINE_ID		9
 	BT_PB_DAI_PIPELINE_ID		10
 	BT_PB_DAI_PIPELINE_SRC "copier.host.9.1"
 	BT_PB_PIPELINE_STREAM_NAME "dai-copier.SSP.10.1"
 	GOOGLE_RTC_AEC_SUPPORT		0
 	GOOGLE_RTC_AEC_REF_SOURCE	'module-copier.8.2'
-	GOOGLE_AEC_CORE_ID		0
+	GOOGLE_AEC_CORE_ID		1
 	HEADSET_PCM_NAME		"Headset"
 	SPEAKER_PCM_NAME		"Speakers"
 	INCLUDE_BT_OFFLOAD		true

diff --git a/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake b/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake
@@ -44,7 +44,7 @@ PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
 NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
 SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
 BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=8,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,USE_CHAIN_DMA=true,\
-DEEPBUFFER_D0I3_COMPATIBLE=true,GOOGLE_RTC_AEC_SUPPORT=1,DMIC_CORE_ID=0"
+DEEPBUFFER_D0I3_COMPATIBLE=true,GOOGLE_RTC_AEC_SUPPORT=1,DMIC_CORE_ID=1"
 
 "cavs-rt5682\;sof-mtl-max98357a-rt5682-ssp2-ssp0-2ch-pdm1\;PLATFORM=mtl,NUM_DMICS=2,\
 PDM0_MIC_A_ENABLE=0,PDM0_MIC_B_ENABLE=0,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\