Skip to content

Commit 054003f

Browse files
ranj063lgirdwood
authored andcommitted
topology2: host-gateway-playback: Replace audio_format objects
Use input_audio_format/output_audio_format explicitly in preparation for deprecating the audio_format class. Fixes: 7a11e27 ('topology2: host-gateway-capture: Replace audio_format objects') Signed-off-by: Ranjani Sridharan <[email protected]>
1 parent 5945235 commit 054003f

File tree

1 file changed

+24
-21
lines changed

1 file changed

+24
-21
lines changed

tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf

+24-21
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
<include/components/host-copier.conf>
2020
<include/components/pipeline.conf>
21-
<include/common/audio_format.conf>
21+
<include/common/input_audio_format.conf>
22+
<include/common/output_audio_format.conf>
2223

2324
Class.Pipeline."host-gateway-playback" {
2425

@@ -46,26 +47,28 @@ Class.Pipeline."host-gateway-playback" {
4647
type "aif_in"
4748
num_output_pins 1
4849
num_input_audio_formats 3
49-
num_output_audio_formats 3
50-
# 16-bit input format 48KHz 2ch. Output sample format is always 32-bit for playback
51-
Object.Base.audio_format.1 {
52-
out_bit_depth 32
53-
out_valid_bit_depth 32
54-
}
55-
# 24-bit 48KHz 2ch
56-
Object.Base.audio_format.2 {
57-
in_bit_depth 32
58-
in_valid_bit_depth 24
59-
out_bit_depth 32
60-
out_valid_bit_depth 32
61-
}
62-
# 32-bit 48KHz 2ch
63-
Object.Base.audio_format.3 {
64-
in_bit_depth 32
65-
in_valid_bit_depth 32
66-
out_bit_depth 32
67-
out_valid_bit_depth 32
68-
}
50+
num_output_audio_formats 1
51+
Object.Base.input_audio_format [
52+
{
53+
in_bit_depth 16
54+
in_valid_bit_depth 16
55+
}
56+
{
57+
in_bit_depth 32
58+
in_valid_bit_depth 24
59+
}
60+
{
61+
in_bit_depth 32
62+
in_valid_bit_depth 32
63+
}
64+
]
65+
# Output sample format is always 32-bit for playback
66+
Object.Base.output_audio_format [
67+
{
68+
out_bit_depth 32
69+
out_valid_bit_depth 32
70+
}
71+
]
6972
}
7073

7174
pipeline."1" {

0 commit comments

Comments
 (0)