Skip to content

Commit be5de51

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

1 file changed

Lines changed: 61 additions & 17 deletions

File tree

tools/topology/topology2/platform/intel/deep-buffer.conf

Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,60 @@ Object.Pipeline.deepbuffer-playback [
66
Object.Widget.host-copier.1 {
77
stream_name $DEEP_BUFFER_PCM_NAME
88
pcm_id $DEEP_BUFFER_PCM_ID
9-
Object.Base.input_audio_format [
10-
{
11-
in_rate $DEEP_BUF_JACK_RATE
12-
in_bit_depth 16
13-
in_valid_bit_depth 16
14-
}
15-
{
16-
in_rate $DEEP_BUF_JACK_RATE
17-
in_bit_depth 32
18-
in_valid_bit_depth 24
19-
}
20-
{
21-
in_rate $DEEP_BUF_JACK_RATE
22-
in_bit_depth 32
23-
in_valid_bit_depth 32
9+
IncludeByKey.PCM_FORMAT_ALL {
10+
"true" {
11+
num_input_audio_formats 5
12+
Object.Base.input_audio_format [
13+
{
14+
in_rate $DEEP_BUF_JACK_RATE
15+
in_bit_depth 16
16+
in_valid_bit_depth 16
17+
}
18+
{
19+
in_rate $DEEP_BUF_JACK_RATE
20+
in_bit_depth 32
21+
in_valid_bit_depth 24
22+
}
23+
{
24+
in_rate $DEEP_BUF_JACK_RATE
25+
in_bit_depth 32
26+
in_valid_bit_depth 32
27+
}
28+
{
29+
in_rate $DEEP_BUF_JACK_RATE
30+
in_bit_depth 32
31+
in_valid_bit_depth 32
32+
in_sample_type $SAMPLE_TYPE_FLOAT
33+
}
34+
{
35+
in_rate $DEEP_BUF_JACK_RATE
36+
in_bit_depth 8
37+
in_valid_bit_depth 8
38+
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
39+
}
40+
]
41+
}
42+
"false" {
43+
num_input_audio_formats 3
44+
Object.Base.input_audio_format [
45+
{
46+
in_rate $DEEP_BUF_JACK_RATE
47+
in_bit_depth 16
48+
in_valid_bit_depth 16
49+
}
50+
{
51+
in_rate $DEEP_BUF_JACK_RATE
52+
in_bit_depth 32
53+
in_valid_bit_depth 24
54+
}
55+
{
56+
in_rate $DEEP_BUF_JACK_RATE
57+
in_bit_depth 32
58+
in_valid_bit_depth 32
59+
}
60+
]
2461
}
25-
]
62+
}
2663
Object.Base.output_audio_format [
2764
{
2865
out_rate $DEEP_BUF_JACK_RATE
@@ -83,7 +120,14 @@ Object.PCM.pcm [
83120

84121
Object.PCM.pcm_caps.1 {
85122
name $DEEP_BUFFER_PCM_NAME
86-
formats 'S16_LE,S24_LE,S32_LE'
123+
IncludeByKey.PCM_FORMAT_ALL {
124+
"true" {
125+
formats 'S16_LE,S24_LE,S32_LE,U8,FLOAT_LE'
126+
}
127+
"false" {
128+
formats 'S16_LE,S24_LE,S32_LE'
129+
}
130+
}
87131
# To avoid DMA spinning on a buffer we need bigger
88132
# buffer than the host buffer size, let's say twice as
89133
# big

0 commit comments

Comments
 (0)