Skip to content

Commit bd7ddd6

Browse files
committed
topology2: dts: add DTS playback pipeline
Add cavs-mixin-mixin-mixout-eqiir-dts-ssp.conf to support EQ IIR + DTS processing on rt5682 Co-developed-by: Mac Chiang <mac.chiang@intel.com> Signed-off-by: Mac Chiang <mac.chiang@intel.com> Signed-off-by: Joe Cheng <joe.cheng@xperi.com>
1 parent 790464d commit bd7ddd6

2 files changed

Lines changed: 131 additions & 0 deletions

File tree

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
#
2+
# Pipeline definitions
3+
#
4+
# PCM0 ---> gain ----> Mixin ----> Mixout ----> gain ----> EQ IIR ----> DTS ----> SSP0
5+
# PCM1 ---> gain ----> Mixin ----> Mixout ----> gain ----> EQ IIR ----> DTS ----> SSP1
6+
7+
# Pipeline ID:1 PCM ID: 0
8+
Object.Pipeline {
9+
# playback pipelines
10+
host-copier-gain-mixin-playback [
11+
{
12+
index 1
13+
14+
Object.Widget.host-copier.1 {
15+
stream_name '$HEADSET_PLAYBACK_PCM_STREAM_NAME'
16+
pcm_id $HEADSET_PCM_ID
17+
}
18+
Object.Widget.gain.1 {
19+
Object.Control.mixer.1 {
20+
name 'Pre Mixer $HEADSET_PCM_NAME Playback Volume'
21+
}
22+
}
23+
}
24+
{
25+
index 3
26+
27+
Object.Widget.host-copier.1 {
28+
stream_name '$SPEAKER_PLAYBACK_PCM_STREAM_NAME'
29+
pcm_id $SPEAKER_PCM_ID
30+
}
31+
Object.Widget.gain.1 {
32+
Object.Control.mixer.1 {
33+
name 'Pre Mixer $SPEAKER_PCM_NAME Playback Volume'
34+
}
35+
}
36+
}
37+
]
38+
39+
mixout-gain-eqiir-dts-dai-copier-playback [
40+
{
41+
index 2
42+
43+
Object.Widget.dai-copier.1 {
44+
dai_index $HEADSET_SSP_DAI_INDEX
45+
dai_type "SSP"
46+
copier_type "SSP"
47+
stream_name "$HEADSET_CODEC_NAME"
48+
node_type $I2S_LINK_OUTPUT_CLASS
49+
}
50+
51+
Object.Widget.gain.1 {
52+
Object.Control.mixer.1 {
53+
name 'Post Mixer $HEADSET_PCM_NAME Playback Volume'
54+
}
55+
}
56+
57+
Object.Widget.eqiir.1 {
58+
Object.Control.bytes."1" {
59+
name 'EQIIR2.0 eqiir_coef_2'
60+
}
61+
}
62+
63+
Object.Widget.dts.1 {
64+
Object.Control.bytes."1" {
65+
max 2048
66+
name 'CODEC_ADAPTER2.0 DTS Codec Setup 2'
67+
}
68+
}
69+
}
70+
{
71+
index 4
72+
73+
Object.Widget.dai-copier.1 {
74+
dai_index $SPEAKER_SSP_DAI_INDEX
75+
dai_type "SSP"
76+
copier_type "SSP"
77+
stream_name "$SPEAKER_CODEC_NAME"
78+
node_type $I2S_LINK_OUTPUT_CLASS
79+
}
80+
81+
Object.Widget.gain.1 {
82+
Object.Control.mixer.1 {
83+
name 'Post Mixer $SPEAKER_PCM_NAME Playback Volume'
84+
}
85+
}
86+
87+
Object.Widget.eqiir.1 {
88+
Object.Control.bytes."1" {
89+
name 'EQIIR1.0 eqiir_coef_1'
90+
}
91+
}
92+
93+
Object.Widget.dts.1 {
94+
Object.Control.bytes."1" {
95+
max 2048
96+
name 'CODEC_ADAPTER1.0 DTS Codec Setup 1'
97+
}
98+
}
99+
100+
}
101+
]
102+
}
103+
104+
Object.Base.route [
105+
{
106+
source "gain.2.1"
107+
sink "eqiir.2.1"
108+
}
109+
{
110+
source "dts.2.1"
111+
sink "dai-copier.SSP.$HEADSET_CODEC_NAME.playback"
112+
}
113+
{
114+
source "mixin.1.1"
115+
sink "mixout.2.1"
116+
}
117+
{
118+
source "gain.4.1"
119+
sink "eqiir.4.1"
120+
}
121+
{
122+
source "dts.4.1"
123+
sink "dai-copier.SSP.$SPEAKER_CODEC_NAME.playback"
124+
}
125+
{
126+
source "mixin.3.1"
127+
sink "mixout.4.1"
128+
}
129+
]

tools/topology/topology2/cavs-rt5682.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<io-gateway-capture.conf>
1818
<host-copier-gain-mixin-playback.conf>
1919
<mixout-gain-dai-copier-playback.conf>
20+
<mixout-gain-eqiir-dts-dai-copier-playback.conf>
2021
<deepbuffer-playback.conf>
2122
<dai-copier-be.conf>
2223
<dai-copier-eqiir-module-copier-capture.conf>
@@ -143,6 +144,7 @@ IncludeByKey.INCLUDE_BT_OFFLOAD {
143144

144145
IncludeByKey.PLAYBACK_PIPELINE_SRC {
145146
"volume" "cavs-mixin-mixout-ssp.conf"
147+
"dts" "cavs-mixin-mixout-eqiir-dts-ssp.conf"
146148
}
147149

148150

0 commit comments

Comments
 (0)