Topology: DMIC: Reduce PCM capabilities to DMIC configuration

singalsu · singalsu · commit dd9f62fcf869 · 2018-10-04T16:57:11.000+03:00
This patch impacts topologies sof-apl-nocodec, sof-apl-da7219, and
sof-glk-da7219 those use the pipe-passthrough-capture macro for DMIC.

The PCM saple rate is limited to 48 kHz (was 8 - 192 kHz). The capture
channels count can be only PIPELINE_CHANNELS (was 1 - PIPELINE_CHANNELS).
This prevents corrupted audio capture that happens when DMIC topology
parameters and capture parameters differ. It happens because DMIC FIFOs
drop samples or add unwanted samples when the configuration does not match.

In sof-apl-nocodec topology the PIPELINE_CHANNELS is set to 2 that
matches the configuration.

Signed-off-by: Seppo Ingalsuo &lt;seppo.ingalsuo@linux.intel.com&gt;
diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4
@@ -115,7 +115,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
 # Passthrough capture pipeline 13 on PCM 6 using max 4 channels.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
-	13, 6, 4, s32le,
+	13, 6, 2, s32le,
 	48, 1000, 0, 0)
 
 #
diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4
@@ -44,4 +44,4 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID
 # PCM Configuration
 #
 
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, COMP_FORMAT_NAME(PIPELINE_FORMAT), 8000, 192000, 1, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)
+PCM_CAPABILITIES(Passthrough Capture PCM_ID, COMP_FORMAT_NAME(PIPELINE_FORMAT), 48000, 48000,  PIPELINE_CHANNELS, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,`
`115`	`115`	`# Passthrough capture pipeline 13 on PCM 6 using max 4 channels.`
`116`	`116`	`# Schedule 48 frames per 1000us deadline on core 0 with priority 0`
`117`	`117`	`PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,`
`118`		`- 13, 6, 4, s32le,`
	`118`	`+ 13, 6, 2, s32le,`
`119`	`119`	`48, 1000, 0, 0)`
`120`	`120`
`121`	`121`	`#`
Original file line number	Diff line number	Diff line change
@@ -44,4 +44,4 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID
`44`	`44`	`# PCM Configuration`
`45`	`45`	`#`
`46`	`46`
`47`		`-PCM_CAPABILITIES(Passthrough Capture PCM_ID, COMP_FORMAT_NAME(PIPELINE_FORMAT), 8000, 192000, 1, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)`
	`47`	`+PCM_CAPABILITIES(Passthrough Capture PCM_ID, COMP_FORMAT_NAME(PIPELINE_FORMAT), 48000, 48000, PIPELINE_CHANNELS, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)`