Skip to content

Commit

Permalink
Tools: Topology2: Add sof-hda-benchmark-multiband_drc16/24/32-tgl build
Browse files Browse the repository at this point in the history
This patch adds the multiband-DRC test topologies build.

Signed-off-by: Seppo Ingalsuo <[email protected]>
  • Loading branch information
singalsu authored and kv2019i committed Nov 1, 2023
1 parent 1e5e7ed commit 98e687e
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 0 deletions.
17 changes: 17 additions & 0 deletions tools/topology/topology2/cavs-benchmark-hda.conf
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,23 @@ IncludeByKey.BENCH_CONFIG {
<include/bench/drc_s32.conf>
}

# Multiband-DRC component
# Note: Due to alsatplg regexp match feature in IncludeByKey call it e.g. drc_multiband16
# to not match multiband_drc16 with drc16 and get error "No variable defined
# for BENCH_DRC_PARAMS" when building these.

"drc_multiband16" {
<include/bench/multiband_drc_s16.conf>
}

"drc_multiband24" {
<include/bench/multiband_drc_s24.conf>
}

"drc_multiband32" {
<include/bench/multiband_drc_s32.conf>
}

#
# EQFIR component
#
Expand Down
2 changes: 2 additions & 0 deletions tools/topology/topology2/development/tplg-targets-bench.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ set(sampleformats "16" "24" "32")
set(components
"dcblock"
"drc"
"drc_multiband"
"eqiir"
"eqfir"
)

set(component_parameters
"BENCH_DCBLOCK_PARAMS=default"
"BENCH_DRC_PARAMS=enabled"
"BENCH_DRC_MULTIBAND_PARAMS=default"
"BENCH_EQIIR_PARAMS=highpass_50hz_0db_48khz"
"BENCH_EQFIR_PARAMS=loudness"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Created initially with script "./bench_comp_generate.sh multiband_drc"
# may need edits to modify controls
Object.Control {
bytes."1" {
name '$ANALOG_CAPTURE_PCM MULTIBAND_DRC bytes'
IncludeByKey.BENCH_DRC_MULTIBAND_PARAMS {
"default" "include/components/multiband_drc/default.conf"
}
}
mixer."1" {
name '$ANALOG_CAPTURE_PCM MULTIBAND_DRC enable'
}
#enum."1" {
# name '$ANALOG_CAPTURE_PCM MULTIBAND_DRC enum'
#}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Created initially with script "./bench_comp_generate.sh multiband_drc"
# may need edits to modify controls
Object.Control {
bytes."1" {
name '$ANALOG_PLAYBACK_PCM MULTIBAND_DRC bytes'
IncludeByKey.BENCH_DRC_MULTIBAND_PARAMS {
"default" "include/components/multiband_drc/default.conf"
}
}
mixer."1" {
name '$ANALOG_PLAYBACK_PCM MULTIBAND_DRC enable'
}
#enum."1" {
# name '$ANALOG_PLAYBACK_PCM MULTIBAND_DRC enum'
#}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Created with script "./bench_comp_generate.sh multiband_drc"
Object.Base.route [
{
sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback'
source 'multiband_drc.1.1'
}
{
sink 'multiband_drc.1.1'
source 'host-copier.0.playback'
}
{
source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture'
sink 'multiband_drc.3.2'
}
{
source 'multiband_drc.3.2'
sink 'host-copier.0.capture'
}
]
13 changes: 13 additions & 0 deletions tools/topology/topology2/include/bench/multiband_drc_s16.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Created with script "./bench_comp_generate.sh multiband_drc"
Object.Widget.multiband_drc.1 {
index 1
<include/bench/one_input_output_format_s16.conf>
<include/bench/multiband_drc_controls_playback.conf>
}
Object.Widget.multiband_drc.2 {
index 3
<include/bench/one_input_output_format_s16.conf>
<include/bench/multiband_drc_controls_capture.conf>
}
<include/bench/host_io_gateway_pipelines_s16.conf>
<include/bench/multiband_drc_hda_route.conf>
13 changes: 13 additions & 0 deletions tools/topology/topology2/include/bench/multiband_drc_s24.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Created with script "./bench_comp_generate.sh multiband_drc"
Object.Widget.multiband_drc.1 {
index 1
<include/bench/one_input_output_format_s24.conf>
<include/bench/multiband_drc_controls_playback.conf>
}
Object.Widget.multiband_drc.2 {
index 3
<include/bench/one_input_output_format_s24.conf>
<include/bench/multiband_drc_controls_capture.conf>
}
<include/bench/host_io_gateway_pipelines_s24.conf>
<include/bench/multiband_drc_hda_route.conf>
13 changes: 13 additions & 0 deletions tools/topology/topology2/include/bench/multiband_drc_s32.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Created with script "./bench_comp_generate.sh multiband_drc"
Object.Widget.multiband_drc.1 {
index 1
<include/bench/one_input_output_format_s32.conf>
<include/bench/multiband_drc_controls_playback.conf>
}
Object.Widget.multiband_drc.2 {
index 3
<include/bench/one_input_output_format_s32.conf>
<include/bench/multiband_drc_controls_capture.conf>
}
<include/bench/host_io_gateway_pipelines_s32.conf>
<include/bench/multiband_drc_hda_route.conf>

0 comments on commit 98e687e

Please sign in to comment.