topology2: set pipeline priority for google aec stream

Set priority for aec stream so that driver can trigger pipeline based on pipeline priority. Signed-off-by: Rander Wang <[email protected]>
thesofproject · Sep 18, 2023 · 43bc954 · 43bc954
1 parent f114ace
commit 43bc954
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
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 change
@@ Expand Up / @@ -180,6 +180,7 @@ IncludeByKey.PASSTHROUGH { @@
     				}
     				Object.Widget.pipeline."1" {
     					core $DMIC_CORE_ID
+    					priority $DMIC_PIPELINE_PRIORITY
     				}
     			}
     		]
@@ Expand Down @@