diff --git a/tools/topology/topology2/cavs-benchmark-hda.conf b/tools/topology/topology2/cavs-benchmark-hda.conf index 9a74f57e9449..e77d932085b7 100644 --- a/tools/topology/topology2/cavs-benchmark-hda.conf +++ b/tools/topology/topology2/cavs-benchmark-hda.conf @@ -260,4 +260,20 @@ IncludeByKey.BENCH_CONFIG { "eqiir32" { } + + # + # Gain component + # + + "gain16" { + + } + + "gain24" { + + } + + "gain32" { + + } } diff --git a/tools/topology/topology2/development/tplg-targets-bench.cmake b/tools/topology/topology2/development/tplg-targets-bench.cmake index ded35b11b2d4..b04feef180f9 100644 --- a/tools/topology/topology2/development/tplg-targets-bench.cmake +++ b/tools/topology/topology2/development/tplg-targets-bench.cmake @@ -14,6 +14,7 @@ set(components "drc_multiband" "eqiir" "eqfir" + "gain" ) set(component_parameters @@ -22,6 +23,7 @@ set(component_parameters "BENCH_DRC_MULTIBAND_PARAMS=default" "BENCH_EQIIR_PARAMS=highpass_50hz_0db_48khz" "BENCH_EQFIR_PARAMS=loudness" + "BENCH_GAIN_PARAMS=default" ) foreach(p ${platforms}) diff --git a/tools/topology/topology2/include/bench/gain_controls_capture.conf b/tools/topology/topology2/include/bench/gain_controls_capture.conf new file mode 100644 index 000000000000..421223b2a58c --- /dev/null +++ b/tools/topology/topology2/include/bench/gain_controls_capture.conf @@ -0,0 +1,16 @@ + # Created initially with script "./bench_comp_generate.sh gain" + # may need edits to modify controls + Object.Control { + #bytes."1" { + # name '$ANALOG_CAPTURE_PCM GAIN bytes' + # IncludeByKey.BENCH_GAIN_PARAMS { + # "default" "include/components/gain/default.conf" + # } + #} + mixer."1" { + name '$ANALOG_CAPTURE_PCM GAIN volume' + } + #enum."1" { + # name '$ANALOG_CAPTURE_PCM GAIN enum' + #} + } diff --git a/tools/topology/topology2/include/bench/gain_controls_playback.conf b/tools/topology/topology2/include/bench/gain_controls_playback.conf new file mode 100644 index 000000000000..95f034a4cd52 --- /dev/null +++ b/tools/topology/topology2/include/bench/gain_controls_playback.conf @@ -0,0 +1,16 @@ + # Created initially with script "./bench_comp_generate.sh gain" + # may need edits to modify controls + Object.Control { + #bytes."1" { + # name '$ANALOG_PLAYBACK_PCM GAIN bytes' + # IncludeByKey.BENCH_GAIN_PARAMS { + # "default" "include/components/gain/default.conf" + # } + #} + mixer."1" { + name '$ANALOG_PLAYBACK_PCM GAIN volume' + } + #enum."1" { + # name '$ANALOG_PLAYBACK_PCM GAIN enum' + #} + } diff --git a/tools/topology/topology2/include/bench/gain_hda_route.conf b/tools/topology/topology2/include/bench/gain_hda_route.conf new file mode 100644 index 000000000000..9f4eb3a2bcab --- /dev/null +++ b/tools/topology/topology2/include/bench/gain_hda_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh gain" + Object.Base.route [ + { + sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' + source 'gain.1.1' + } + { + sink 'gain.1.1' + source 'host-copier.0.playback' + } + { + source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' + sink 'gain.3.2' + } + { + source 'gain.3.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/gain_s16.conf b/tools/topology/topology2/include/bench/gain_s16.conf new file mode 100644 index 000000000000..3c3098c48f7c --- /dev/null +++ b/tools/topology/topology2/include/bench/gain_s16.conf @@ -0,0 +1,13 @@ + # Created with script "./bench_comp_generate.sh gain" + Object.Widget.gain.1 { + index 1 + + + } + Object.Widget.gain.2 { + index 3 + + + } + + diff --git a/tools/topology/topology2/include/bench/gain_s24.conf b/tools/topology/topology2/include/bench/gain_s24.conf new file mode 100644 index 000000000000..cb9ba3f416fd --- /dev/null +++ b/tools/topology/topology2/include/bench/gain_s24.conf @@ -0,0 +1,13 @@ + # Created with script "./bench_comp_generate.sh gain" + Object.Widget.gain.1 { + index 1 + + + } + Object.Widget.gain.2 { + index 3 + + + } + + diff --git a/tools/topology/topology2/include/bench/gain_s32.conf b/tools/topology/topology2/include/bench/gain_s32.conf new file mode 100644 index 000000000000..a9607383f59c --- /dev/null +++ b/tools/topology/topology2/include/bench/gain_s32.conf @@ -0,0 +1,13 @@ + # Created with script "./bench_comp_generate.sh gain" + Object.Widget.gain.1 { + index 1 + + + } + Object.Widget.gain.2 { + index 3 + + + } + +