tools: topology2: update WoV pipeline graph with dual-path KPB routing

Author: lrgirdwo

tools/topology/topology2/include/pipelines/cavs/host-gateway-src-mfcc-tflm-capture.conf

@@ -1,14 +1,13 @@
 #
-# SRC-MFCC-TFLM capture pipeline
+# SRC-MFCC-TFLM capture detection pipeline
 #
-# This class provides host pipeline for capture with MFCC feature extraction
+# This class provides detection pipeline for capture with MFCC feature extraction
 # fed to TFLM classification micro speech module.
 #
 
 <include/common/input_audio_format.conf>
 <include/common/output_audio_format.conf>
 <include/components/pipeline.conf>
-<include/components/host-copier.conf>
 <include/components/src.conf>
 <include/components/mfcc.conf>
 <include/components/tflm.conf>
@@ -30,6 +29,11 @@ Class.Pipeline."host-gateway-src-mfcc-tflm-capture" {
 	}
 
 	Object.Widget {
+		virtual."1" {
+			name "virtual.tflm_sink"
+			type out_drv
+		}
+
 		src."1" {
 			num_input_pins 1
 			num_output_pins 1
@@ -107,31 +111,6 @@ Class.Pipeline."host-gateway-src-mfcc-tflm-capture" {
 			]
 		}
 
-		host-copier."1" {
-			type	"aif_out"
-			node_type $HDA_HOST_INPUT_CLASS
-			num_input_pins 1
-			num_output_pins 1
-			num_input_audio_formats 1
-			num_output_audio_formats 1
-			Object.Base.input_audio_format [
-				{
-					in_bit_depth		32
-					in_valid_bit_depth	32
-					in_rate			16000
-					ibs			$MFCC_FRAME_BYTES
-				}
-			]
-			Object.Base.output_audio_format [
-				{
-					out_bit_depth		32
-					out_valid_bit_depth	32
-					out_rate		16000
-					obs			$MFCC_FRAME_BYTES
-				}
-			]
-		}
-
 		pipeline."1" {
 			priority	0
 			lp_mode		0
@@ -148,6 +127,10 @@ Class.Pipeline."host-gateway-src-mfcc-tflm-capture" {
 				source	mfcc.$index.1
 				sink	tflmcly.$index.1
 			}
+			{
+				source	tflmcly.$index.1
+				sink	"virtual.tflm_sink"
+			}
 		]
 	}
 

tools/topology/topology2/sof-hda-tflm.conf

@@ -47,7 +47,8 @@ Define {
 	HDA_ANALOG_CAPTURE_RATE		48000
 	HDA_ANALOG_PLAYBACK_RATE	48000
 	HDA_TFLM_CAPTURE_PCM_ID		0
-	HDA_TFLM_HOST_PIPELINE_ID	1
+	HDA_TFLM_HOST_PIPELINE_ID	0
+	HDA_TFLM_DETECT_PIPELINE_ID	1
 	HDA_TFLM_DAI_PIPELINE_ID	2
 }
 
@@ -72,17 +73,39 @@ Object.Dai.HDA [
 ]
 
 Object.Pipeline {
-	host-gateway-src-mfcc-tflm-capture [
+	host-gateway-capture [
 		{
 			index $HDA_TFLM_HOST_PIPELINE_ID
 
 			Object.Widget.host-copier.1 {
 				stream_name $ANALOG_CAPTURE_PCM
 				pcm_id $HDA_TFLM_CAPTURE_PCM_ID
+				num_input_audio_formats 1
+				num_output_audio_formats 1
+				Object.Base.input_audio_format [
+					{
+						in_rate			$HDA_ANALOG_CAPTURE_RATE
+						in_bit_depth		32
+						in_valid_bit_depth	32
+					}
+				]
+				Object.Base.output_audio_format [
+					{
+						out_rate		$HDA_ANALOG_CAPTURE_RATE
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
+				]
 			}
 		}
 	]
 
+	host-gateway-src-mfcc-tflm-capture [
+		{
+			index $HDA_TFLM_DETECT_PIPELINE_ID
+		}
+	]
+
 	dai-copier-gain-module-copier-capture [
 		{
 			index $HDA_TFLM_DAI_PIPELINE_ID
@@ -152,26 +175,6 @@ Object.Pipeline {
 					}
 				]
 			}
-
-			Object.Widget.module-copier.2 {
-				stream_name $HDA_ANALOG_DAI_NAME
-				num_input_audio_formats 1
-				num_output_audio_formats 1
-				Object.Base.input_audio_format [
-					{
-						in_rate			$HDA_ANALOG_CAPTURE_RATE
-						in_bit_depth		32
-						in_valid_bit_depth	32
-					}
-				]
-				Object.Base.output_audio_format [
-					{
-						out_rate		$HDA_ANALOG_CAPTURE_RATE
-						out_bit_depth		32
-						out_valid_bit_depth	32
-					}
-				]
-			}
 		}
 	]
 }
@@ -185,16 +188,14 @@ Object.Base.route [
 		source "gain.$HDA_TFLM_DAI_PIPELINE_ID.1"
 		sink "kpb.$HDA_TFLM_DAI_PIPELINE_ID.1"
 	}
+	# KPB output pin 1 -> Real-time detection path (SRC -> MFCC -> TFLM)
 	{
 		source "kpb.$HDA_TFLM_DAI_PIPELINE_ID.1"
-		sink "module-copier.$HDA_TFLM_DAI_PIPELINE_ID.2"
+		sink "src.$HDA_TFLM_DETECT_PIPELINE_ID.1"
 	}
+	# KPB output pin 2 -> Host WoV Draining PCM capture stream
 	{
-		source "module-copier.$HDA_TFLM_DAI_PIPELINE_ID.2"
-		sink "src.$HDA_TFLM_HOST_PIPELINE_ID.1"
-	}
-	{
-		source "tflmcly.$HDA_TFLM_HOST_PIPELINE_ID.1"
+		source "kpb.$HDA_TFLM_DAI_PIPELINE_ID.1"
 		sink "host-copier.$HDA_TFLM_CAPTURE_PCM_ID.capture"
 	}
 ]
@@ -211,8 +212,8 @@ Object.PCM.pcm [
 
 		Object.PCM.pcm_caps.1 {
 			name $ANALOG_CAPTURE_PCM
-			formats 'S16_LE'
-			rates '16000'
+			formats 'S32_LE'
+			rates '48000'
 			channels_min 1
 			channels_max 1
 		}