From 9050d82a7d7dd588bd0267d17ad2b6ec0a2379b6 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Tue, 2 Oct 2018 13:54:04 -0700 Subject: [PATCH] Use passed in number of channels for pipeline Pipelines should not expose more channels than what they are configured to support. Signed-off-by: Curtis Malainey --- topology/sof/pipe-eq-fir-volume-playback.m4 | 2 +- topology/sof/pipe-eq-iir-volume-playback.m4 | 2 +- topology/sof/pipe-eq-volume-playback.m4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/topology/sof/pipe-eq-fir-volume-playback.m4 b/topology/sof/pipe-eq-fir-volume-playback.m4 index da66d6c..8f6c645 100644 --- a/topology/sof/pipe-eq-fir-volume-playback.m4 +++ b/topology/sof/pipe-eq-fir-volume-playback.m4 @@ -93,5 +93,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration # -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536) diff --git a/topology/sof/pipe-eq-iir-volume-playback.m4 b/topology/sof/pipe-eq-iir-volume-playback.m4 index 3b93f3c..490835c 100644 --- a/topology/sof/pipe-eq-iir-volume-playback.m4 +++ b/topology/sof/pipe-eq-iir-volume-playback.m4 @@ -97,5 +97,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration # -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536) diff --git a/topology/sof/pipe-eq-volume-playback.m4 b/topology/sof/pipe-eq-volume-playback.m4 index c3ca5b7..fc40c4d 100644 --- a/topology/sof/pipe-eq-volume-playback.m4 +++ b/topology/sof/pipe-eq-volume-playback.m4 @@ -121,5 +121,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration # -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)