Skip to content

Commit 181bfe1

Browse files
macchianmwasko
authored andcommitted
topology1: sof-hda-generic: enable Waves playback
Reuse the pipe-wave-codec-playback.m4 and enable this pipeline on HDA0 for speaker/headphone playaback. HDA0.OUT dai pipeline is included for codec adapter widget connection. Signed-off-by: Mac Chiang <mac.chiang@intel.com>
1 parent 8c1cf55 commit 181bfe1

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

tools/topology/topology1/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ set(TPLGS
2929
"sof-hda-generic\;sof-hda-generic-4ch\;-DCHANNELS=4\;-DHSPROC=volume\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DDYNAMIC=1"
3030
"sof-hda-generic\;sof-hda-generic-4ch-bt\;-DCHANNELS=4\;-DHSPROC=volume\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DDYNAMIC=1\;-DBT_OFFLOAD"
3131
"sof-hda-generic\;sof-hda-generic-4ch-dts\;-DCHANNELS=4\;-DHSPROC=volume\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DDYNAMIC=1\;-DDTS=`DTS'"
32+
"sof-hda-generic\;sof-hda-generic-4ch-waves\;-DCHANNELS=4\;-DHSPROC=volume\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DDYNAMIC=1\;-DWAVES"
3233
## end HDaudio codec topologies
3334

3435
"sof-hda-generic-idisp\;sof-hda-generic-idisp\;-DCHANNELS=0\;-DDYNAMIC=1"

tools/topology/topology1/sof-hda-generic.m4

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ define(`BT_PCM_ID', `8')
4646
define(`HW_CONFIG_ID', 8)
4747
include(`platform/intel/intel-generic-bt.m4')')
4848

49+
# define HDA0_OUT DAI pipeline if the codec adapter is included.
50+
ifdef(`DTS',`define(PIPELINE_HDA0_OUT)')
51+
ifdef(`WAVES',`
52+
define(PIPELINE_HDA0_OUT)
53+
define(`ENDPOINT_NAME', `Codec')')
54+
4955
# The pipeline naming notation is pipe-mixer-PROCESSING-dai-DIRECTION.m4
5056
# HSPROC is set by makefile, if not the default above is applied
5157
define(PIPE_HEADSET_PLAYBACK, `sof/pipe-mixer-`HSPROC'-dai-playback.m4')
@@ -107,18 +113,19 @@ DAI_ADD(PIPE_HEADSET_PLAYBACK,
107113
# Low Latency playback pipeline 1 on PCM 30 using max 2 channels of s32le.
108114
# 1000us deadline on core 0 with priority 0
109115
PIPELINE_PCM_ADD(
110-
ifdef(`DTS', sof/pipe-eq-iir-dts-codec-playback.m4, sof/pipe-host-volume-playback.m4),
116+
ifdef(`DTS', sof/pipe-eq-iir-dts-codec-playback.m4,
117+
ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-host-volume-playback.m4)),
111118
30, 0, 2, s32le,
112119
1000, 0, 0,
113120
48000, 48000, 48000,
114121
SCHEDULE_TIME_DOMAIN_TIMER,
115122
PIPELINE_PLAYBACK_SCHED_COMP_1)
116123

117-
ifdef(`DTS',
124+
ifdef(`PIPELINE_HDA0_OUT',
118125
`
119-
# Because there is no dai pipeline.30 for HDA0.OUT in pipe-eq-iir-dts-codec-playback.m4, so
120-
# using macro defined W_PIPELINE_TOP() to add missing dai pipeline back. Instead of
121-
# modifying in pipe-eq-iir-dts-codec-playback.m4, these changes are not necessary for all others.
126+
# Because there is no dai pipeline.30 for HDA0.OUT in corresponding m4 file, so
127+
# using macro defined W_PIPELINE_TOP() to add missing dai pipeline back.
128+
# The changes are applying to connect codec adapter widget configuration.
122129
W_PIPELINE_TOP(30, HDA0.OUT, 1000, 0, 0, 1, pipe_dai_schedule_plat)
123130
')
124131

0 commit comments

Comments
 (0)