Tools: Topology: Add Micsel module to MFCC capture pipeline

This patch adds the Micsel (or Selector) module with a configuration
blob for stereo to double mono to source of MFCC. The Micsel module
has better input select capabilities than bare MFCC module. The sum
of L+R provides a slightly better SNR than the single (left) channel
pick with MFCC for it's mono processing. It will reduce a bit noise
in the audio features and possibly improve speech recognition quality.

The previous pipeline class host-gateway-src-mfcc-capture.conf is
removed because there is no other use for it.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

Author: singalsu

tools/topology/topology2/cavs-sdw.conf

@@ -27,7 +27,7 @@
 <host-gateway-playback.conf>
 <host-gateway-capture.conf>
 <host-gateway-tdfb-drc-capture.conf>
-<host-gateway-src-mfcc-capture.conf>
+<host-gateway-src-micsel-mfcc-capture.conf>
 <src.conf>
 <io-gateway.conf>
 <io-gateway-capture.conf>

…/cavs/host-gateway-src-mfcc-capture.conf …ost-gateway-src-micsel-mfcc-capture.conftools/topology/topology2/include/pipelines/cavs/host-gateway-src-mfcc-capture.conf renamed to tools/topology/topology2/include/pipelines/cavs/host-gateway-src-micsel-mfcc-capture.conf tools/topology/topology2/include/pipelines/cavs/host-gateway-src-mfcc-capture.conf renamed to tools/topology/topology2/include/pipelines/cavs/host-gateway-src-micsel-mfcc-capture.conf

@@ -1,13 +1,13 @@
 #
-# SRC-MFCC capture pipeline
+# SRC-Micsel-MFCC capture pipeline
 #
 # This class provides host pipeline for capture with MFCC audio features input.
 # All attributes defined herein are namespaced by alsatplg to
-# "Object.Pipeline.host-gateway-src-mfcc-capture.N.attribute_name".
+# "Object.Pipeline.host-gateway-src-micsel-mfcc-capture.N.attribute_name".
 #
-# Usage: host-gateway-src-mfcc-capture pipeline object can be instantiated as:
+# Usage: host-gateway-src-micsel-mfcc-capture pipeline object can be instantiated as:
 #
-# Object.Pipeline.host-gateway-src-mfcc-capture."N" {
+# Object.Pipeline.host-gateway-src-micsel-mfcc-capture."N" {
 #	period		1000
 #	time_domain	"timer"
 # }
@@ -20,9 +20,10 @@
 <include/components/pipeline.conf>
 <include/components/host-copier.conf>
 <include/components/src.conf>
+<include/components/micsel.conf>
 <include/components/mfcc.conf>
 
-Class.Pipeline."host-gateway-src-mfcc-capture" {
+Class.Pipeline."host-gateway-src-micsel-mfcc-capture" {
 
 	<include/pipelines/pipeline-common.conf>
 
@@ -32,8 +33,8 @@ Class.Pipeline."host-gateway-src-mfcc-capture" {
 		]
 
 		#
-		# host-gateway-src-mfcc-capture objects instantiated within the same alsaconf
-		# node must have unique pipeline_id attribute
+		# host-gateway-src-micsel-mfcc-capture objects instantiated within the
+		# same alsaconf node must have unique pipeline_id attribute
 		#
 		unique	"instance"
 	}
@@ -70,6 +71,27 @@ Class.Pipeline."host-gateway-src-mfcc-capture" {
 			]
 		}
 
+		micsel."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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_rate		16000
+					out_channels		2
+					out_ch_cfg $CHANNEL_CONFIG_DUAL_MONO
+				}
+			]
+		}
+
 		mfcc."1" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
@@ -123,6 +145,10 @@ Class.Pipeline."host-gateway-src-mfcc-capture" {
 		!route [
 			{
 				source	src.$index.1
+				sink	micsel.$index.1
+			}
+			{
+				source	micsel.$index.1
 				sink	mfcc.$index.1
 			}
 		]

tools/topology/topology2/platform/intel/sdw-dmic-audio-feature.conf

@@ -6,7 +6,7 @@ Define {
 	SDW_DMIC_AUDIO_FEATURE_CAPTURE_PIPELINE_ID 131
 }
 
-Object.Pipeline.host-gateway-src-mfcc-capture [
+Object.Pipeline.host-gateway-src-micsel-mfcc-capture [
 	{
 		index $SDW_DMIC_AUDIO_FEATURE_CAPTURE_PIPELINE_ID
 
@@ -15,6 +15,15 @@ Object.Pipeline.host-gateway-src-mfcc-capture [
 			pcm_id $SDW_DMIC_AUDIO_FEATURE_CAPTURE_PCM_ID
 		}
 
+		Object.Widget.micsel.1 {
+			Object.Control {
+				bytes."1" {
+					name "$SDW_DMIC_AUDIO_FEATURE_CAPTURE_PCM_NAME Micsel bytes"
+					<include/components/micsel/downmix_stereo_to_doublemono.conf>
+				}
+			}
+		}
+
 		Object.Widget.mfcc.1 {
 			Object.Control {
 				bytes."1" {

tools/topology/topology2/platform/intel/sdw-jack-audio-feature.conf

@@ -6,7 +6,7 @@ Define {
 	SDW_JACK_AUDIO_FEATURE_CAPTURE_PIPELINE_ID 130
 }
 
-Object.Pipeline.host-gateway-src-mfcc-capture [
+Object.Pipeline.host-gateway-src-micsel-mfcc-capture [
 	{
 		index $SDW_JACK_AUDIO_FEATURE_CAPTURE_PIPELINE_ID
 
@@ -15,6 +15,15 @@ Object.Pipeline.host-gateway-src-mfcc-capture [
 			pcm_id $SDW_JACK_AUDIO_FEATURE_CAPTURE_PCM_ID
 		}
 
+		Object.Widget.micsel.1 {
+			Object.Control {
+				bytes."1" {
+					name "$SDW_JACK_AUDIO_FEATURE_CAPTURE_PCM_NAME Micsel bytes"
+					<include/components/micsel/downmix_stereo_to_doublemono.conf>
+				}
+			}
+		}
+
 		Object.Widget.mfcc.1 {
 			Object.Control {
 				bytes."1" {