From 046ef11cdc814dac23b2388c4b250889e358e691 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Fri, 27 Sep 2024 11:51:58 +0300 Subject: [PATCH] Tools: Topology2: Add to benchmark topologies equalizers more options There is currently no default.conf, so the default is set to passthrough.conf. This patch also changes IIR topology build default response to "loudness" for better higher workload and easier to measure when checking that it's correct. This prepares for process_test.m components verification with ipc4 testbench. Signed-off-by: Seppo Ingalsuo --- .../topology2/development/tplg-targets-bench.cmake | 2 +- .../include/bench/eqfir_control_bytes_capture.conf | 8 +++++--- .../include/bench/eqfir_control_bytes_playback.conf | 8 +++++--- .../include/bench/eqiir_control_bytes_capture.conf | 11 +++++++++-- .../include/bench/eqiir_control_bytes_playback.conf | 11 +++++++++-- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/tools/topology/topology2/development/tplg-targets-bench.cmake b/tools/topology/topology2/development/tplg-targets-bench.cmake index 0f4c540bb..93f2385dc 100644 --- a/tools/topology/topology2/development/tplg-targets-bench.cmake +++ b/tools/topology/topology2/development/tplg-targets-bench.cmake @@ -27,7 +27,7 @@ set(component_parameters "BENCH_DCBLOCK_PARAMS=default" "BENCH_DRC_PARAMS=enabled" "BENCH_DRC_MULTIBAND_PARAMS=default" - "BENCH_EQIIR_PARAMS=highpass_50hz_0db_48khz" + "BENCH_EQIIR_PARAMS=loudness" "BENCH_EQFIR_PARAMS=loudness" "BENCH_GAIN_PARAMS=default" "BENCH_IGO_NR_PARAMS=default" diff --git a/tools/topology/topology2/include/bench/eqfir_control_bytes_capture.conf b/tools/topology/topology2/include/bench/eqfir_control_bytes_capture.conf index a63e00c85..ecde34e39 100644 --- a/tools/topology/topology2/include/bench/eqfir_control_bytes_capture.conf +++ b/tools/topology/topology2/include/bench/eqfir_control_bytes_capture.conf @@ -3,8 +3,10 @@ Object.Control.bytes."1" { name '$ANALOG_CAPTURE_PCM EQFIR bytes' IncludeByKey.BENCH_EQFIR_PARAMS { - "default" "include/components/eqfir/default.conf" - "loudness" "include/components/eqfir/loudness.conf" - "passthrough" "include/components/eqfir/passthrough.conf" + "default" "include/components/eqfir/passthrough.conf" + "flat" "include/components/eqfir/flat.conf" + "loudness" "include/components/eqfir/loudness.conf" + "midboost" "include/components/eqfir/midboost.conf" + "passthrough" "include/components/eqfir/passthrough.conf" } } diff --git a/tools/topology/topology2/include/bench/eqfir_control_bytes_playback.conf b/tools/topology/topology2/include/bench/eqfir_control_bytes_playback.conf index aa0c0c8da..d65fd4606 100644 --- a/tools/topology/topology2/include/bench/eqfir_control_bytes_playback.conf +++ b/tools/topology/topology2/include/bench/eqfir_control_bytes_playback.conf @@ -3,8 +3,10 @@ Object.Control.bytes."1" { name '$ANALOG_PLAYBACK_PCM EQFIR bytes' IncludeByKey.BENCH_EQFIR_PARAMS { - "default" "include/components/eqfir/default.conf" - "loudness" "include/components/eqfir/loudness.conf" - "passthrough" "include/components/eqfir/passthrough.conf" + "default" "include/components/eqfir/passthrough.conf" + "flat" "include/components/eqfir/flat.conf" + "loudness" "include/components/eqfir/loudness.conf" + "midboost" "include/components/eqfir/midboost.conf" + "passthrough" "include/components/eqfir/passthrough.conf" } } diff --git a/tools/topology/topology2/include/bench/eqiir_control_bytes_capture.conf b/tools/topology/topology2/include/bench/eqiir_control_bytes_capture.conf index a8b72846b..f5f0b4ba9 100644 --- a/tools/topology/topology2/include/bench/eqiir_control_bytes_capture.conf +++ b/tools/topology/topology2/include/bench/eqiir_control_bytes_capture.conf @@ -3,7 +3,14 @@ Object.Control.bytes."1" { name '$ANALOG_CAPTURE_PCM EQIIR bytes' IncludeByKey.BENCH_EQIIR_PARAMS { - "default" "include/components/eqiir/default.conf" - "highpass_50hz_0db_48khz" "include/components/eqiir/highpass_50hz_0db_48khz.conf" + "default" "include/components/eqiir/passthrough.conf" + "bandpass" "include/components/eqiir/bandpass.conf" + "bassboost" "include/components/eqiir/bassboost.conf" + "flat" "include/components/eqiir/flat.conf" + "loudness" "include/components/eqiir/loudness.conf" + "passthrough" "include/components/eqiir/passthrough.conf" + "highpass_20hz_0db_48khz" "include/components/eqiir/highpass_20hz_0db_48khz.conf" + "highpass_50hz_0db_48khz" "include/components/eqiir/highpass_50hz_0db_48khz.conf" + "highpass_100hz_0db_48khz" "include/components/eqiir/highpass_100hz_0db_48khz.conf" } } diff --git a/tools/topology/topology2/include/bench/eqiir_control_bytes_playback.conf b/tools/topology/topology2/include/bench/eqiir_control_bytes_playback.conf index 5ae6ad905..8164586ae 100644 --- a/tools/topology/topology2/include/bench/eqiir_control_bytes_playback.conf +++ b/tools/topology/topology2/include/bench/eqiir_control_bytes_playback.conf @@ -3,7 +3,14 @@ Object.Control.bytes."1" { name '$ANALOG_PLAYBACK_PCM EQIIR bytes' IncludeByKey.BENCH_EQIIR_PARAMS { - "default" "include/components/eqiir/default.conf" - "highpass_50hz_0db_48khz" "include/components/eqiir/highpass_50hz_0db_48khz.conf" + "default" "include/components/eqiir/passthrough.conf" + "bandpass" "include/components/eqiir/bandpass.conf" + "bassboost" "include/components/eqiir/bassboost.conf" + "flat" "include/components/eqiir/flat.conf" + "loudness" "include/components/eqiir/loudness.conf" + "passthrough" "include/components/eqiir/passthrough.conf" + "highpass_20hz_0db_48khz" "include/components/eqiir/highpass_20hz_0db_48khz.conf" + "highpass_50hz_0db_48khz" "include/components/eqiir/highpass_50hz_0db_48khz.conf" + "highpass_100hz_0db_48khz" "include/components/eqiir/highpass_100hz_0db_48khz.conf" } }