From 13a9355f2365c40cacada6c45a048c25f6339279 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Tue, 20 Jul 2021 18:03:02 +0300 Subject: [PATCH] Tools: Fix topology1 path in Matlab language scripts The change for topology1 was missing from various tuning and testing scripts those access binary blob data from topology m4 directories. Signed-off-by: Seppo Ingalsuo --- tools/test/audio/process_test.m | 2 +- tools/tune/crossover/example_crossover.m | 2 +- tools/tune/dcblock/example_dcblock.m | 2 +- tools/tune/drc/example_drc.m | 2 +- tools/tune/eq/example_fir_eq.m | 2 +- tools/tune/eq/example_iir_eq.m | 2 +- tools/tune/eq/example_spk_eq.m | 2 +- tools/tune/multiband_drc/example_multiband_drc.m | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/test/audio/process_test.m b/tools/test/audio/process_test.m index ef04b0729434..eb6bdb013c78 100644 --- a/tools/test/audio/process_test.m +++ b/tools/test/audio/process_test.m @@ -26,7 +26,7 @@ end %% Paths -t.blobpath = '../../topology/m4'; +t.blobpath = '../../topology/topology1/m4'; plots = 'plots'; reports = 'reports'; diff --git a/tools/tune/crossover/example_crossover.m b/tools/tune/crossover/example_crossover.m index 3166f4a4f022..72238fb3f882 100644 --- a/tools/tune/crossover/example_crossover.m +++ b/tools/tune/crossover/example_crossover.m @@ -1,7 +1,7 @@ function example_crossover(); % Set the parameters here -tplg_fn = "../../topology/m4/crossover_coef_default.m4" % Control Bytes File +tplg_fn = "../../topology/topology1/m4/crossover_coef_default.m4" % Control Bytes File % Use those files with sof-ctl to update the component's configuration blob_fn = "../../ctl/crossover_coef.blob" % Blob binary file alsa_fn = "../../ctl/crossover_coef.txt" % ALSA CSV format file diff --git a/tools/tune/dcblock/example_dcblock.m b/tools/tune/dcblock/example_dcblock.m index 180b9b5e514f..74490e5ab159 100644 --- a/tools/tune/dcblock/example_dcblock.m +++ b/tools/tune/dcblock/example_dcblock.m @@ -1,7 +1,7 @@ function example_dcblock(); % Set the parameters here -tplg_fn = "../../topology/m4/dcblock_coef_default.m4" % Control Bytes File +tplg_fn = "../../topology/topology1/m4/dcblock_coef_default.m4" % Control Bytes File % Use those files with sof-ctl to update the component's configuration blob_fn = "../../ctl/dcblock_coef.blob" % Blob binary file alsa_fn = "../../ctl/dcblock_coef.txt" % ALSA CSV format file diff --git a/tools/tune/drc/example_drc.m b/tools/tune/drc/example_drc.m index accfb8d2ddd0..580aede93d8f 100644 --- a/tools/tune/drc/example_drc.m +++ b/tools/tune/drc/example_drc.m @@ -1,7 +1,7 @@ function example_drc(); % Set the parameters here -tplg_fn = "../../topology/m4/drc_coef_default.m4"; % Control Bytes File +tplg_fn = "../../topology/topology1/m4/drc_coef_default.m4"; % Control Bytes File % Use those files with sof-ctl to update the component's configuration blob_fn = "../../ctl/drc_coef.blob"; % Blob binary file alsa_fn = "../../ctl/drc_coef.txt"; % ALSA CSV format file diff --git a/tools/tune/eq/example_fir_eq.m b/tools/tune/eq/example_fir_eq.m index 6f3e730cc811..053c64c9611d 100644 --- a/tools/tune/eq/example_fir_eq.m +++ b/tools/tune/eq/example_fir_eq.m @@ -10,7 +10,7 @@ function example_fir_eq() %% Common definitions fs = 48e3; -tpath = '../../topology/m4'; +tpath = '../../topology/topology1/m4'; cpath = '../../ctl'; priv = 'DEF_EQFIR_PRIV'; diff --git a/tools/tune/eq/example_iir_eq.m b/tools/tune/eq/example_iir_eq.m index c26314ff808d..b4a52ee19204 100644 --- a/tools/tune/eq/example_iir_eq.m +++ b/tools/tune/eq/example_iir_eq.m @@ -10,7 +10,7 @@ function example_iir_eq() %% Common definitions fs = 48e3; -tpath = '../../topology/m4'; +tpath = '../../topology/topology1/m4'; cpath = '../../ctl'; priv = 'DEF_EQIIR_PRIV'; diff --git a/tools/tune/eq/example_spk_eq.m b/tools/tune/eq/example_spk_eq.m index 1c8e12e06f5b..fdc1f096ac42 100644 --- a/tools/tune/eq/example_spk_eq.m +++ b/tools/tune/eq/example_spk_eq.m @@ -15,7 +15,7 @@ function example_spk_eq() %% Defaults fs = 48e3; -tpath = '../../topology/m4'; +tpath = '../../topology/topology1/m4'; cpath = '../../ctl'; iir_priv = 'DEF_EQIIR_PRIV'; fir_priv = 'DEF_EQFIR_PRIV'; diff --git a/tools/tune/multiband_drc/example_multiband_drc.m b/tools/tune/multiband_drc/example_multiband_drc.m index da8c43460129..2594c3b86682 100644 --- a/tools/tune/multiband_drc/example_multiband_drc.m +++ b/tools/tune/multiband_drc/example_multiband_drc.m @@ -1,7 +1,7 @@ function example_multiband_drc(); % Set the parameters here -tplg_fn = "../../topology/m4/multiband_drc_coef_default.m4"; % Control Bytes File +tplg_fn = "../../topology/topology1/m4/multiband_drc_coef_default.m4"; % Control Bytes File % Use those files with sof-ctl to update the component's configuration blob_fn = "../../ctl/multiband_drc_coef.blob"; % Blob binary file alsa_fn = "../../ctl/multiband_drc_coef.txt"; % ALSA CSV format file