Skip to content

Commit 2199842

Browse files
committed
Tools: Topology: Phase Vocoder: Bench topology to test the component
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent 38ec2da commit 2199842

18 files changed

+405
-0
lines changed

tools/topology/topology2/cavs-benchmark-hda.conf

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<mixin.conf>
4545
<mixout.conf>
4646
<multiband_drc.conf>
47+
<phase_vocoder.conf>
4748
<rtnr.conf>
4849
<sound_dose.conf>
4950
<src.conf>
@@ -837,6 +838,22 @@ IncludeByKey.BENCH_CONFIG {
837838
<include/bench/micsel_multich_s32.conf>
838839
}
839840

841+
#
842+
# Phase Vocoder component
843+
#
844+
845+
"phase_vocoder16" {
846+
<include/bench/phase_vocoder_s16.conf>
847+
}
848+
849+
"phase_vocoder24" {
850+
<include/bench/phase_vocoder_s24.conf>
851+
}
852+
853+
"phase_vocoder32" {
854+
<include/bench/phase_vocoder_s32.conf>
855+
}
856+
840857
#
841858
# RTNR component
842859
#

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<level_multiplier.conf>
4242
<micsel.conf>
4343
<multiband_drc.conf>
44+
<phase_vocoder.conf>
4445
<rtnr.conf>
4546
<sound_dose.conf>
4647
<src.conf>
@@ -460,6 +461,22 @@ IncludeByKey.BENCH_CONFIG {
460461
<include/bench/micsel_multich_s32.conf>
461462
}
462463

464+
#
465+
# Phase Vocoder component
466+
#
467+
468+
"phase_vocoder16" {
469+
<include/bench/phase_vocoder_s16.conf>
470+
}
471+
472+
"phase_vocoder24" {
473+
<include/bench/phase_vocoder_s24.conf>
474+
}
475+
476+
"phase_vocoder32" {
477+
<include/bench/phase_vocoder_s32.conf>
478+
}
479+
463480
#
464481
# RTNR component
465482
#

tools/topology/topology2/development/tplg-targets-bench.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set(components
1919
"igo_nr"
2020
"level_multiplier"
2121
"micsel"
22+
"phase_vocoder"
2223
"rtnr"
2324
"sound_dose"
2425
"src"
@@ -44,6 +45,7 @@ set(component_parameters
4445
"BENCH_IGO_NR_PARAMS=default"
4546
"BENCH_LEVEL_MULTIPLIER_PARAMS=default"
4647
"BENCH_MICSEL_PARAMS=passthrough"
48+
"BENCH_PHASE_VOCODER_PARAMS=default"
4749
"BENCH_RTNR_PARAMS=default"
4850
"BENCH_SOUND_DOSE_PARAMS=default"
4951
"BENCH_SRC_PARAMS=default"
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
num_input_audio_formats 1
2+
num_output_audio_formats 1
3+
4+
# 32-bit 48KHz 2ch
5+
Object.Base.input_audio_format [
6+
{
7+
in_bit_depth 32
8+
in_valid_bit_depth 32
9+
ibs 1024
10+
}
11+
]
12+
Object.Base.output_audio_format [
13+
{
14+
out_bit_depth 32
15+
out_valid_bit_depth 32
16+
obs 1024
17+
}
18+
]
19+
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
num_input_audio_formats 1
2+
num_output_audio_formats 1
3+
4+
# 32-bit 48KHz 2ch
5+
Object.Base.input_audio_format [
6+
{
7+
in_bit_depth 32
8+
in_valid_bit_depth 32
9+
ibs 1536
10+
}
11+
]
12+
Object.Base.output_audio_format [
13+
{
14+
out_bit_depth 32
15+
out_valid_bit_depth 32
16+
obs 1536
17+
}
18+
]
19+
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
num_input_audio_formats 1
2+
num_output_audio_formats 1
3+
4+
# 32-bit 48KHz 2ch
5+
Object.Base.input_audio_format [
6+
{
7+
in_bit_depth 32
8+
in_valid_bit_depth 32
9+
ibs 2048
10+
}
11+
]
12+
Object.Base.output_audio_format [
13+
{
14+
out_bit_depth 32
15+
out_valid_bit_depth 32
16+
obs 2048
17+
}
18+
]
19+
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
num_input_audio_formats 1
2+
num_output_audio_formats 1
3+
4+
# 32-bit 48KHz 2ch, ibs/obs is set to match
5+
# 5 ms or 240 stereo frames period.
6+
Object.Base.input_audio_format [
7+
{
8+
in_bit_depth 32
9+
in_valid_bit_depth 32
10+
in_channels 2
11+
ibs 1920
12+
}
13+
]
14+
Object.Base.output_audio_format [
15+
{
16+
out_bit_depth 32
17+
out_valid_bit_depth 32
18+
out_channels 2
19+
obs 1920
20+
}
21+
]
22+
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Created initially with script "./bench_comp_generate.sh phase_vocoder"
2+
# may need edits to modify controls
3+
Object.Control {
4+
# Un-comment the supported controls in PHASE_VOCODER
5+
bytes."1" {
6+
name '$ANALOG_CAPTURE_PCM Phase Vocoder bytes'
7+
IncludeByKey.BENCH_PHASE_VOCODER_PARAMS {
8+
"default" "include/components/phase_vocoder/hann_1024_256.conf"
9+
}
10+
}
11+
mixer."1" {
12+
name '$ANALOG_CAPTURE_PCM Phase Vocoder enable'
13+
}
14+
enum."1" {
15+
name '$ANALOG_CAPTURE_PCM Phase Vocoder speed'
16+
}
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Created initially with script "./bench_comp_generate.sh phase_vocoder"
2+
# may need edits to modify controls
3+
Object.Control {
4+
# Un-comment the supported controls in PHASE_VOCODER
5+
bytes."1" {
6+
name '$ANALOG_PLAYBACK_PCM Phase Vocoder bytes'
7+
IncludeByKey.BENCH_PHASE_VOCODER_PARAMS {
8+
"default" "include/components/phase_vocoder/hann_1024_256.conf"
9+
}
10+
}
11+
mixer."1" {
12+
name '$ANALOG_PLAYBACK_PCM Phase Vocoder enable'
13+
}
14+
enum."1" {
15+
name '$ANALOG_PLAYBACK_PCM Phase Vocoder speed'
16+
}
17+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Created with script "./bench_comp_generate.sh phase_vocoder"
2+
Object.Base.route [
3+
{
4+
sink '$BENCH_PLAYBACK_DAI_COPIER'
5+
source 'phase_vocoder.$BENCH_PLAYBACK_HOST_PIPELINE.1'
6+
}
7+
{
8+
sink 'phase_vocoder.$BENCH_PLAYBACK_HOST_PIPELINE.1'
9+
source 'host-copier.0.playback'
10+
}
11+
{
12+
source '$BENCH_CAPTURE_DAI_COPIER'
13+
sink 'phase_vocoder.$BENCH_CAPTURE_HOST_PIPELINE.2'
14+
}
15+
{
16+
source 'phase_vocoder.$BENCH_CAPTURE_HOST_PIPELINE.2'
17+
sink 'host-copier.0.capture'
18+
}
19+
]

0 commit comments

Comments
 (0)