Skip to content

Commit 8ff6484

Browse files
singalsukv2019i
authored andcommitted
Tools: Topology: Add FLOAT_LE and U8 formats to SDW speaker
This patch adds option to add float and unsigned 8-bit playback formats to SDW speaker if PCM_FORMAT_ALL is set to true. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent be5de51 commit 8ff6484

1 file changed

Lines changed: 54 additions & 1 deletion

File tree

tools/topology/topology2/platform/intel/sdw-amp-generic.conf

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,52 @@ IncludeByKey.PASSTHROUGH {
4242
Object.Widget.host-copier.1 {
4343
stream_name "sdw amplifiers"
4444
pcm_id 2
45+
IncludeByKey.PCM_FORMAT_ALL {
46+
"true" {
47+
num_input_audio_formats 5
48+
Object.Base.input_audio_format [
49+
{
50+
in_bit_depth 16
51+
in_valid_bit_depth 16
52+
}
53+
{
54+
in_bit_depth 32
55+
in_valid_bit_depth 32
56+
}
57+
{
58+
in_bit_depth 32
59+
in_valid_bit_depth 24
60+
}
61+
{
62+
in_bit_depth 32
63+
in_valid_bit_depth 32
64+
in_sample_type $SAMPLE_TYPE_FLOAT
65+
}
66+
{
67+
in_bit_depth 8
68+
in_valid_bit_depth 8
69+
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
70+
}
71+
]
72+
}
73+
"false" {
74+
num_input_audio_formats 3
75+
Object.Base.input_audio_format [
76+
{
77+
in_bit_depth 16
78+
in_valid_bit_depth 16
79+
}
80+
{
81+
in_bit_depth 32
82+
in_valid_bit_depth 24
83+
}
84+
{
85+
in_bit_depth 32
86+
in_valid_bit_depth 32
87+
}
88+
]
89+
}
90+
}
4591
}
4692
Object.Widget.gain.1 {
4793
Object.Control.mixer.1 {
@@ -577,7 +623,14 @@ Object.PCM.pcm [
577623

578624
Object.PCM.pcm_caps.1 {
579625
name "sdw amplifiers"
580-
formats 'S16_LE,S24_LE,S32_LE'
626+
IncludeByKey.PCM_FORMAT_ALL {
627+
"true" {
628+
formats 'S16_LE,S24_LE,S32_LE,U8,FLOAT_LE'
629+
}
630+
"false" {
631+
formats 'S16_LE,S24_LE,S32_LE'
632+
}
633+
}
581634
}
582635
}
583636
]

0 commit comments

Comments
 (0)