From dc8cf3e4d544266bc6319d97f9be427592051931 Mon Sep 17 00:00:00 2001 From: Fred Oh Date: Thu, 12 Mar 2020 22:53:25 -0700 Subject: [PATCH] topology: add equalizer to hda generic topology Add EQIIR and EQFIR to first playback pipeline. This help to expand more equalizer testing across platforms. Signed-off-by: Fred Oh --- tools/topology/CMakeLists.txt | 8 +++++--- tools/topology/sof-hda-generic.m4 | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index 5b7880cc6..591eb87f9 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -23,9 +23,11 @@ set(TPLGS "sof-cht-max98090\;sof-cht-max98090" "sof-cht-rt5682\;sof-cht-rt5682" "sof-cht-src-50khz-pcm512x\;sof-cht-src-50khz-pcm512x" - "sof-hda-generic\;sof-hda-generic\;-DCHANNELS=0" - "sof-hda-generic\;sof-hda-generic-2ch\;-DCHANNELS=2" - "sof-hda-generic\;sof-hda-generic-4ch\;-DCHANNELS=4" + "sof-hda-generic\;sof-hda-generic\;-DCHANNELS=0\;-DPPROC=volume" + "sof-hda-generic\;sof-hda-generic-2ch\;-DCHANNELS=2\;-DPPROC=volume" + "sof-hda-generic\;sof-hda-generic-4ch\;-DCHANNELS=4\;-DPPROC=volume" + "sof-hda-generic\;sof-hda-generic-eq-2ch\;-DCHANNELS=2\;-DPPROC=eq-volume" + "sof-hda-generic\;sof-hda-generic-eq-4ch\;-DCHANNELS=4\;-DPPROC=eq-volume" "sof-hda-generic-idisp\;sof-hda-generic-idisp\;-DCHANNELS=0" "sof-hda-generic-idisp\;sof-hda-generic-idisp-2ch\;-DCHANNELS=2" "sof-hda-generic-idisp\;sof-hda-generic-idisp-4ch\;-DCHANNELS=4" diff --git a/tools/topology/sof-hda-generic.m4 b/tools/topology/sof-hda-generic.m4 index 9544b2034..5d7d9b3df 100644 --- a/tools/topology/sof-hda-generic.m4 +++ b/tools/topology/sof-hda-generic.m4 @@ -27,6 +27,10 @@ include(`platform/intel/intel-generic-dmic.m4') ' ) +# The pipeline naming notation is pipe-PROCESSING-DIRECTION.m4 +# PPROC is set by makefile +define(PIPE_VOLUME_PLAYBACK, `sof/pipe-`PPROC'-playback.m4') + # # Define the pipelines # @@ -41,7 +45,7 @@ include(`platform/intel/intel-generic-dmic.m4') # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. # 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, +PIPELINE_PCM_ADD(PIPE_VOLUME_PLAYBACK, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000)