Skip to content

Commit 22cd285

Browse files
joechengxperijoechengxperi
committed
Topology2 : add DTS topology to support PTL
Signed-off-by: Joe Cheng <joe.cheng@xperi.com>
1 parent 5fe3939 commit 22cd285

File tree

6 files changed

+1898
-2
lines changed

6 files changed

+1898
-2
lines changed

‎tools/topology/topology2/cavs-sdw.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<mixout-gain-micsel-eqiir-eqfir-alh-dai-copier-playback.conf>
1818
<mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback.conf>
1919
<mixout-gain-eqiir-eqfir-drc-micsel-eqiir-eqfir-alh-dai-copier-playback.conf>
20+
<mixout-gain-eqiir-dts-alh-dai-copier-playback.conf>
2021
<dai-copier-gain-eqiir-module-copier-capture.conf>
2122
<gain-capture.conf>
2223
<gain-copier-capture.conf>
@@ -191,6 +192,7 @@ IncludeByKey.SDW_AMP_XOVER {
191192
"[1-3]" {
192193
IncludeByKey.SDW_AMP_PIPELINE_SRC {
193194
"dax" "platform/intel/sdw-amp-dax.conf"
195+
"dts" "platform/intel/sdw-amp-dts.conf"
194196
"generic" "platform/intel/sdw-amp-generic.conf"
195197
}
196198
}
@@ -214,6 +216,7 @@ IncludeByKey.SDW_JACK {
214216
"true" {
215217
IncludeByKey.SDW_JACK_PIPELINE_SRC {
216218
"dax" "platform/intel/sdw-jack-dax.conf"
219+
"dts" "platform/intel/sdw-jack-dts.conf"
217220
"generic" "platform/intel/sdw-jack-generic.conf"
218221
}
219222
}

‎tools/topology/topology2/include/pipelines/cavs/mixout-gain-eqiir-dts-alh-dai-copier-playback.conf‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
#
2+
# BE playback pipeline: mixout-gain-alh-dai-copier.
3+
#
4+
# All attributes defined herein are namespaced
5+
# by alsatplg to "Object.Pipeline.mixout-gain-alh-dai-copier-playback.N.attribute_name"
6+
#
7+
# Usage: mixout-gain-alh-dai-copier-playback pipeline object can be instantiated as:
8+
#
9+
# Object.Pipeline.mixout-gain-alh-dai-copier-playback."N" {
10+
# time_domain "timer"
11+
# }
12+
#
13+
# Where N is the unique pipeline ID within the same alsaconf node.
14+
#
15+
16+
<include/components/alh-dai-copier.conf>
17+
<include/components/gain.conf>
18+
<include/components/mixout.conf>
19+
<include/components/pipeline.conf>
20+
<include/controls/bytes.conf>
21+
<include/components/eqiir.conf>
22+
<include/components/dts.conf>
23+
24+
Class.Pipeline."mixout-gain-eqiir-dts-alh-dai-copier-playback" {
25+
26+
<include/pipelines/pipeline-common.conf>
27+
28+
attributes {
29+
!constructor [
30+
"index"
31+
]
32+
33+
!immutable [
34+
"direction"
35+
]
36+
37+
#
38+
# mixout-gain-alh-dai-copier-playback objects instantiated within the same alsaconf
39+
# node must have unique instance attribute
40+
#
41+
unique "instance"
42+
}
43+
44+
Object.Widget {
45+
mixout."1" {}
46+
alh-copier."1" {
47+
type dai_in
48+
num_input_audio_formats 1
49+
num_output_audio_formats 1
50+
num_input_pins 1
51+
52+
# copier only supports one format based on mixin/mixout requirements:
53+
# 32-bit 48KHz 2ch
54+
Object.Base.input_audio_format [
55+
{
56+
in_bit_depth 32
57+
in_valid_bit_depth 32
58+
in_sample_type $SAMPLE_TYPE_MSB_INTEGER
59+
in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]"
60+
}
61+
]
62+
Object.Base.output_audio_format [
63+
{
64+
out_bit_depth 32
65+
out_valid_bit_depth 32
66+
out_sample_type $SAMPLE_TYPE_MSB_INTEGER
67+
out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
68+
}
69+
]
70+
}
71+
gain."1" {
72+
num_input_audio_formats 1
73+
num_output_audio_formats 1
74+
75+
# 32-bit 48KHz 2ch
76+
Object.Base.input_audio_format [
77+
{
78+
in_bit_depth 32
79+
in_valid_bit_depth 32
80+
}
81+
]
82+
Object.Base.output_audio_format [
83+
{
84+
out_bit_depth 32
85+
out_valid_bit_depth 32
86+
}
87+
]
88+
}
89+
90+
eqiir."1" {
91+
num_input_audio_formats 1
92+
num_output_audio_formats 1
93+
94+
Object.Base.input_audio_format [
95+
{
96+
in_bit_depth 32
97+
in_valid_bit_depth 32
98+
}
99+
]
100+
Object.Base.output_audio_format [
101+
{
102+
out_bit_depth 32
103+
out_valid_bit_depth 32
104+
}
105+
]
106+
107+
Object.Control.bytes."1" {
108+
<include/components/eqiir/flat.conf>
109+
}
110+
}
111+
112+
dts."1" {
113+
num_input_audio_formats 1
114+
num_output_audio_formats 1
115+
116+
Object.Base.input_audio_format [
117+
{
118+
in_bit_depth 32
119+
in_valid_bit_depth 32
120+
}
121+
]
122+
Object.Base.output_audio_format [
123+
{
124+
out_bit_depth 32
125+
out_valid_bit_depth 32
126+
}
127+
]
128+
}
129+
130+
pipeline."1" {
131+
priority 0
132+
lp_mode 0
133+
}
134+
}
135+
136+
Object.Base {
137+
!route [
138+
{
139+
source mixout.$index.1
140+
sink gain.$index.1
141+
}
142+
{
143+
source gain.$index.1
144+
sink eqiir.$index.1
145+
}
146+
{
147+
source eqiir.$index.1
148+
sink dts.$index.1
149+
}
150+
]
151+
}
152+
153+
direction "playback"
154+
dynamic_pipeline 1
155+
time_domain "timer"
156+
}

‎tools/topology/topology2/include/pipelines/cavs/mixout-gain-eqiir-dts-dai-copier-playback.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
2-
# BE playback pipeline: mixout-gain-dts-dai-copier.
2+
# BE playback pipeline: mixout-gain-eqiir-dts-dai-copier.
33
#
44
# All attributes defined herein are namespaced
55
# by alsatplg to "Object.Pipeline.mixout-gain-eqiir-dts-dai-copier-playback.N.attribute_name"
66
#
7-
# Usage: mixout-gain-dts-dai-copier-playback pipeline object can be instantiated as:
7+
# Usage: mixout-gain-eqiir-dts-dai-copier-playback pipeline object can be instantiated as:
88
#
99
# Object.Pipeline.mixout-gain-dts-dai-copier-playback."N" {
1010
# period 1000

0 commit comments

Comments
 (0)