Skip to content

Commit 569917b

Browse files
committed
topology1: sof-hda-generic: enable dts playback
Enabling dts pipeline on HDA0 speaker/headphone plyaback. Using macro W_PIPELINE_TOP() to add missing pipeline widget because no pipeline found for PCM0P. Signed-off-by: Mac Chiang <mac.chiang@intel.com>
1 parent 46261a2 commit 569917b

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

tools/topology/topology1/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ set(TPLGS
2727
"sof-hda-generic\;sof-hda-generic-2ch\;-DCHANNELS=2\;-DHSPROC=volume\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DDYNAMIC=1"
2828
"sof-hda-generic\;sof-hda-generic-3ch\;-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"
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"
30+
"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'"
3031
## end HDaudio codec topologies
3132

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

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,22 @@ DAI_ADD(PIPE_HEADSET_PLAYBACK,
9797

9898
# Low Latency playback pipeline 1 on PCM 30 using max 2 channels of s32le.
9999
# 1000us deadline on core 0 with priority 0
100-
PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
100+
PIPELINE_PCM_ADD(
101+
ifdef(`DTS', sof/pipe-eq-iir-dts-codec-playback.m4, sof/pipe-host-volume-playback.m4),
101102
30, 0, 2, s32le,
102103
1000, 0, 0,
103104
48000, 48000, 48000,
104105
SCHEDULE_TIME_DOMAIN_TIMER,
105106
PIPELINE_PLAYBACK_SCHED_COMP_1)
106107

108+
ifdef(`DTS',
109+
`
110+
# Because there is no pipeline dai connection in pipe-mixer case, so
111+
# using macro defined W_PIPELINE_TOP() to add missing pipeline widget for PCM0P.
112+
# The reason not change in pipe-eq-iir-dts-codec-playback.m4 is due to other m4 dependencies.
113+
W_PIPELINE_TOP(30, HDA0.OUT, 1000, 0, 0, 1, pipe_dai_schedule_plat)
114+
')
115+
107116
# Deep buffer playback pipeline 31 on PCM 31 using max 2 channels of s32le
108117
# Set 1000us deadline on core 0 with priority 0.
109118
# TODO: Modify pipeline deadline to account for deep buffering

0 commit comments

Comments
 (0)