topology2: set pipeline priority for google aec stream

RanderWang · RanderWang · commit 43bc9547da47 · 2023-09-18T14:39:00.000+08:00
Set priority for aec stream so that driver can trigger pipeline based on
pipeline priority.

Signed-off-by: Rander Wang &lt;rander.wang@intel.com&gt;
diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
@@ -103,6 +103,10 @@ Define {
 	SPEAKER_PCM_NAME		"Speakers"
 	SPEAKER_PCM_ID			1
 	INCLUDE_BT_OFFLOAD		true
+	GOOGLE_AEC_HOST_PIPELINE_PRIORITY	3
+	GOOGLE_AEC_PIPELINE_PRIORITY	2
+	DMIC_PIPELINE_PRIORITY		1
+	ECHO_REF_PIPELINE_PRIORITY	0
 }
 
 # override defaults with platform-specific config
diff --git a/tools/topology/topology2/platform/intel/dmic-default.conf b/tools/topology/topology2/platform/intel/dmic-default.conf
@@ -35,4 +35,5 @@ Define {
 	DMIC1_PCM_CAPS			'Passthrough Capture 18'
 	DMIC_CORE_ID			0
 	PASSTHROUGH			"false"
+	DMIC_PIPELINE_PRIORITY		0
 }
diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf
@@ -180,6 +180,7 @@ IncludeByKey.PASSTHROUGH {
 				}
 				Object.Widget.pipeline."1" {
 					core $DMIC_CORE_ID
+					priority $DMIC_PIPELINE_PRIORITY
 				}
 			}
 		]
diff --git a/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf b/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf
@@ -6,6 +6,7 @@ Object.Pipeline.google-rtc-aec-capture [
 		Object.Widget.pipeline.1 {
 			stream_name "DMIC0 RTC AEC"
 			core $GOOGLE_AEC_CORE_ID
+			priority $GOOGLE_AEC_PIPELINE_PRIORITY
 		}
 
 		Object.Widget.google-rtc-aec.1 {
@@ -31,6 +32,7 @@ Object.Pipeline.host-gateway-capture[
                 }
                 Object.Widget.pipeline."1" {
 			core $GOOGLE_AEC_CORE_ID
+			priority $GOOGLE_AEC_HOST_PIPELINE_PRIORITY
 		}
         }
 ]
diff --git a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
@@ -41,7 +41,8 @@ Object.Pipeline {
 				}
 			}
 			Object.Widget.pipeline."1" {
-				core	$ECHO_REF_CORE_ID
+				core		$ECHO_REF_CORE_ID
+				priority	$ECHO_REF_PIPELINE_PRIORITY
 			}
 		}
 	]

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ Define {`
`35`	`35`	`DMIC1_PCM_CAPS 'Passthrough Capture 18'`
`36`	`36`	`DMIC_CORE_ID 0`
`37`	`37`	`PASSTHROUGH "false"`
	`38`	`+ DMIC_PIPELINE_PRIORITY 0`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,7 @@ IncludeByKey.PASSTHROUGH {`
`180`	`180`	`}`
`181`	`181`	`Object.Widget.pipeline."1" {`
`182`	`182`	`core $DMIC_CORE_ID`
	`183`	`+ priority $DMIC_PIPELINE_PRIORITY`
`183`	`184`	`}`
`184`	`185`	`}`
`185`	`186`	`]`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ Object.Pipeline.google-rtc-aec-capture [`
`6`	`6`	`Object.Widget.pipeline.1 {`
`7`	`7`	`stream_name "DMIC0 RTC AEC"`
`8`	`8`	`core $GOOGLE_AEC_CORE_ID`
	`9`	`+ priority $GOOGLE_AEC_PIPELINE_PRIORITY`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`Object.Widget.google-rtc-aec.1 {`
`@@ -31,6 +32,7 @@ Object.Pipeline.host-gateway-capture[`
`31`	`32`	`}`
`32`	`33`	`Object.Widget.pipeline."1" {`
`33`	`34`	`core $GOOGLE_AEC_CORE_ID`
	`35`	`+ priority $GOOGLE_AEC_HOST_PIPELINE_PRIORITY`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`	`]`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ Object.Pipeline {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`Object.Widget.pipeline."1" {`
`44`		`- core $ECHO_REF_CORE_ID`
	`44`	`+ core $ECHO_REF_CORE_ID`
	`45`	`+ priority $ECHO_REF_PIPELINE_PRIORITY`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`]`