Skip to content

Commit 441a0fe

Browse files
committed
Tools: Topology2: ASRC: Remove non-used tokens with IPC4
This patch fixes the configuration tokens for ASRC with IPC4, the tokens asynchronous_mode and rate_in from IPC3 are not valid. In IPC4 all the control is packed to bit-fiels in operation mode. Token rate_out is in use as before. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent e15a3a4 commit 441a0fe

File tree

5 files changed

+31
-41
lines changed

5 files changed

+31
-41
lines changed

tools/topology/topology2/include/bench/asrc_s16.conf

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
# Created with script "./bench_comp_generate.sh asrc"
2+
# Edited/added:
3+
# - operation mode 1 for push for playback, 2 for pull for playback
4+
# - rate_out 48000 for the fixed playback sink rate
5+
# - rate_out 0 for the capture PCM defined sink rate
26
Object.Widget.asrc.1 {
3-
index 1
4-
asynchronous_mode 0
5-
operation_mode 0
6-
rate_out 48000
7+
index 1
8+
operation_mode 1
9+
rate_out 48000
710
<include/components/src_format_s16_convert_to_48k.conf>
811
}
912
Object.Widget.asrc.2 {
10-
index 3
11-
rate_in 48000
12-
asynchronous_mode 0
13-
operation_mode 1
13+
index 3
14+
operation_mode 2
15+
rate_out 0
1416
<include/components/src_format_s16_convert_from_48k.conf>
1517
}
1618
<include/bench/host_io_gateway_pipelines_src_s16.conf>

tools/topology/topology2/include/bench/asrc_s24.conf

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
# Created with script "./bench_comp_generate.sh asrc"
2+
# Edited/added:
3+
# - operation mode 1 for push for playback, 2 for pull for playback
4+
# - rate_out 48000 for the fixed playback sink rate
5+
# - rate_out 0 for the capture PCM defined sink rate
26
Object.Widget.asrc.1 {
3-
index 1
4-
asynchronous_mode 0
5-
operation_mode 0
6-
rate_out 48000
7+
index 1
8+
operation_mode 1
9+
rate_out 48000
710
<include/components/src_format_s24_convert_to_48k.conf>
811
}
912
Object.Widget.asrc.2 {
10-
index 3
11-
asynchronous_mode 0
12-
operation_mode 1
13-
rate_in 48000
13+
index 3
14+
operation_mode 2
15+
rate_out 0
1416
<include/components/src_format_s24_convert_from_48k.conf>
1517
}
1618
<include/bench/host_io_gateway_pipelines_src_s24.conf>

tools/topology/topology2/include/bench/asrc_s32.conf

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
# Created with script "./bench_comp_generate.sh asrc"
2+
# Edited/added:
3+
# - operation mode 1 for push for playback, 2 for pull for playback
4+
# - rate_out 48000 for the fixed playback sink rate
5+
# - rate_out 0 for the capture PCM defined sink rate
26
Object.Widget.asrc.1 {
3-
index 1
4-
asynchronous_mode 0
5-
operation_mode 0
6-
rate_out 48000
7+
index 1
8+
operation_mode 1
9+
rate_out 48000
710
<include/components/src_format_s32_convert_to_48k.conf>
811
}
912
Object.Widget.asrc.2 {
10-
index 3
11-
asynchronous_mode 0
12-
operation_mode 1
13-
rate_in 48000
13+
index 3
14+
operation_mode 2
15+
rate_out 0
1416
<include/components/src_format_s32_convert_from_48k.conf>
1517
}
1618
<include/bench/host_io_gateway_pipelines_src_s32.conf>

tools/topology/topology2/include/common/tokens.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ Object.Base.VendorToken {
6363

6464
"7" {
6565
name "asrc"
66-
rate_in 320
67-
rate_out 321
68-
asynchronous_mode 322
66+
rate_out 321
6967
operation_mode 323
7068
}
7169

tools/topology/topology2/include/components/asrc.conf

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# Object.Widget.asrc."N" {
99
# format "s24le"
1010
# rate_out 48000
11-
# asynchronous_mode 1
1211
# operation_mode 0
1312
# }
1413
#
@@ -32,24 +31,12 @@ Class.Widget."asrc" {
3231
# Bespoke attributes for ASRC
3332
#
3433

35-
# Source sample rate
36-
DefineAttribute."rate_in" {
37-
# Token set reference name and type
38-
token_ref "asrc.word"
39-
40-
}
41-
4234
# Target sample rate
4335
DefineAttribute."rate_out" {
4436
# Token set reference name and type
4537
token_ref "asrc.word"
4638
}
4739

48-
DefineAttribute."asynchronous_mode" {
49-
# Token set reference name and type
50-
token_ref "asrc.word"
51-
}
52-
5340
DefineAttribute."operation_mode" {
5441
# Token set reference name and type
5542
token_ref "asrc.word"
@@ -66,7 +53,6 @@ Class.Widget."asrc" {
6653
]
6754

6855
!mandatory [
69-
"asynchronous_mode"
7056
"operation_mode"
7157
"num_input_audio_formats"
7258
"num_output_audio_formats"

0 commit comments

Comments
 (0)