From 946c8cc5a2f1c9677cdfd4438f469ed835fda867 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Mon, 3 Jun 2024 11:30:35 +0300 Subject: [PATCH 1/3] Audio: SRC: Tune: Move SRC setup scripts to module directory The purpose of this change is to consolidate the files those belong to the SRC module. This commit only moves the files. The next commits are fixing the issues caused by the move. Signed-off-by: Seppo Ingalsuo --- {tools/tune/src => src/audio/src/tune}/README | 0 {tools/tune/src => src/audio/src/tune}/src_export_coef.m | 0 {tools/tune/src => src/audio/src/tune}/src_export_defines.m | 0 {tools/tune/src => src/audio/src/tune}/src_export_table_2s.m | 0 {tools/tune/src => src/audio/src/tune}/src_factor1_lm.m | 0 {tools/tune/src => src/audio/src/tune}/src_factor2_lm.m | 0 {tools/tune/src => src/audio/src/tune}/src_find_l0m0.m | 0 {tools/tune/src => src/audio/src/tune}/src_generate.m | 0 {tools/tune/src => src/audio/src/tune}/src_get.m | 0 {tools/tune/src => src/audio/src/tune}/src_ipc4_int32.m | 0 {tools/tune/src => src/audio/src/tune}/src_param.m | 0 {tools/tune/src => src/audio/src/tune}/src_small_int32.m | 0 {tools/tune/src => src/audio/src/tune}/src_std_int32.m | 0 {tools/tune/src => src/audio/src/tune}/src_tiny_int16.m | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename {tools/tune/src => src/audio/src/tune}/README (100%) rename {tools/tune/src => src/audio/src/tune}/src_export_coef.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_export_defines.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_export_table_2s.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_factor1_lm.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_factor2_lm.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_find_l0m0.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_generate.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_get.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_ipc4_int32.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_param.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_small_int32.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_std_int32.m (100%) rename {tools/tune/src => src/audio/src/tune}/src_tiny_int16.m (100%) diff --git a/tools/tune/src/README b/src/audio/src/tune/README similarity index 100% rename from tools/tune/src/README rename to src/audio/src/tune/README diff --git a/tools/tune/src/src_export_coef.m b/src/audio/src/tune/src_export_coef.m similarity index 100% rename from tools/tune/src/src_export_coef.m rename to src/audio/src/tune/src_export_coef.m diff --git a/tools/tune/src/src_export_defines.m b/src/audio/src/tune/src_export_defines.m similarity index 100% rename from tools/tune/src/src_export_defines.m rename to src/audio/src/tune/src_export_defines.m diff --git a/tools/tune/src/src_export_table_2s.m b/src/audio/src/tune/src_export_table_2s.m similarity index 100% rename from tools/tune/src/src_export_table_2s.m rename to src/audio/src/tune/src_export_table_2s.m diff --git a/tools/tune/src/src_factor1_lm.m b/src/audio/src/tune/src_factor1_lm.m similarity index 100% rename from tools/tune/src/src_factor1_lm.m rename to src/audio/src/tune/src_factor1_lm.m diff --git a/tools/tune/src/src_factor2_lm.m b/src/audio/src/tune/src_factor2_lm.m similarity index 100% rename from tools/tune/src/src_factor2_lm.m rename to src/audio/src/tune/src_factor2_lm.m diff --git a/tools/tune/src/src_find_l0m0.m b/src/audio/src/tune/src_find_l0m0.m similarity index 100% rename from tools/tune/src/src_find_l0m0.m rename to src/audio/src/tune/src_find_l0m0.m diff --git a/tools/tune/src/src_generate.m b/src/audio/src/tune/src_generate.m similarity index 100% rename from tools/tune/src/src_generate.m rename to src/audio/src/tune/src_generate.m diff --git a/tools/tune/src/src_get.m b/src/audio/src/tune/src_get.m similarity index 100% rename from tools/tune/src/src_get.m rename to src/audio/src/tune/src_get.m diff --git a/tools/tune/src/src_ipc4_int32.m b/src/audio/src/tune/src_ipc4_int32.m similarity index 100% rename from tools/tune/src/src_ipc4_int32.m rename to src/audio/src/tune/src_ipc4_int32.m diff --git a/tools/tune/src/src_param.m b/src/audio/src/tune/src_param.m similarity index 100% rename from tools/tune/src/src_param.m rename to src/audio/src/tune/src_param.m diff --git a/tools/tune/src/src_small_int32.m b/src/audio/src/tune/src_small_int32.m similarity index 100% rename from tools/tune/src/src_small_int32.m rename to src/audio/src/tune/src_small_int32.m diff --git a/tools/tune/src/src_std_int32.m b/src/audio/src/tune/src_std_int32.m similarity index 100% rename from tools/tune/src/src_std_int32.m rename to src/audio/src/tune/src_std_int32.m diff --git a/tools/tune/src/src_tiny_int16.m b/src/audio/src/tune/src_tiny_int16.m similarity index 100% rename from tools/tune/src/src_tiny_int16.m rename to src/audio/src/tune/src_tiny_int16.m From b0b6b4418947ec4334a5731d36e2cfd7ab160dd2 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Mon, 3 Jun 2024 11:47:03 +0300 Subject: [PATCH 2/3] Audio: SRC: Tune: Fix search path for other functions Add helper function to add and remove the additional search path. Removing the search path is useful for interactive shell usage. Signed-off-by: Seppo Ingalsuo --- src/audio/src/tune/src_generate.m | 7 ++++--- src/audio/src/tune/src_paths.m | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 src/audio/src/tune/src_paths.m diff --git a/src/audio/src/tune/src_generate.m b/src/audio/src/tune/src_generate.m index c55947bd369b..85809b23b60e 100644 --- a/src/audio/src/tune/src_generate.m +++ b/src/audio/src/tune/src_generate.m @@ -23,12 +23,11 @@ % SPDX-License-Identifier: BSD-3-Clause % -% Copyright (c) 2016-2022, Intel Corporation. All rights reserved. +% Copyright (c) 2016-2024, Intel Corporation. All rights reserved. % % Author: Seppo Ingalsuo -addpath('../../test/audio/std_utils'); -addpath('../../test/audio/test_utils'); +src_paths(1); if (nargin < 2) || (nargin > 4) error('Incorrect arguments for function!'); @@ -282,6 +281,8 @@ fclose(fh); type(fn); +src_paths(0); + end %% Helper functions diff --git a/src/audio/src/tune/src_paths.m b/src/audio/src/tune/src_paths.m new file mode 100644 index 000000000000..b2ee172190a3 --- /dev/null +++ b/src/audio/src/tune/src_paths.m @@ -0,0 +1,22 @@ +function src_paths(enable) + +% src_paths(enable) +% enable - set to 1 to enable needed search path +% set to 0 to disable the search paths +% + +% SPDX-License-Identifier: BSD-3-Clause +% +% Copyright (c) 2024, Intel Corporation. All rights reserved. + +audio_test = '../../../../tools/test/audio/'; + +if enable + addpath(fullfile(audio_test, 'std_utils')); + addpath(fullfile(audio_test, 'test_utils')); +else + rmpath(fullfile(audio_test, 'std_utils')); + rmpath(fullfile(audio_test, 'test_utils')); +end + +end From 6275fa8d7771ec8368efe8b13c45f82c293d866c Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Mon, 3 Jun 2024 13:44:08 +0300 Subject: [PATCH 3/3] Audio: SRC: Tune: Prefix top level functions with sof_ This change is done to avoid conflict with possible other similar scripts. Signed-off-by: Seppo Ingalsuo --- src/audio/src/tune/README | 12 ++++++------ .../src/tune/{src_generate.m => sof_src_generate.m} | 6 +++--- .../tune/{src_ipc4_int32.m => sof_src_ipc4_int32.m} | 2 +- .../{src_small_int32.m => sof_src_small_int32.m} | 2 +- .../tune/{src_std_int32.m => sof_src_std_int32.m} | 2 +- .../tune/{src_tiny_int16.m => sof_src_tiny_int16.m} | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename src/audio/src/tune/{src_generate.m => sof_src_generate.m} (98%) rename src/audio/src/tune/{src_ipc4_int32.m => sof_src_ipc4_int32.m} (96%) rename src/audio/src/tune/{src_small_int32.m => sof_src_small_int32.m} (93%) rename src/audio/src/tune/{src_std_int32.m => sof_src_std_int32.m} (98%) rename src/audio/src/tune/{src_tiny_int16.m => sof_src_tiny_int16.m} (98%) diff --git a/src/audio/src/tune/README b/src/audio/src/tune/README index 456503fb20a0..ad90d7098fc3 100644 --- a/src/audio/src/tune/README +++ b/src/audio/src/tune/README @@ -8,14 +8,14 @@ of objective audio quality parameters. The tools need GNU Octave version 4.0.0 or later with octave-signal package. -src_std_int32.m ---------------- +sof_src_std_int32.m +------------------- This script creates the default coefficient set and contains nothing else but call for src_generate. -src_tiny_int16.m ----------------- +sof_src_tiny_int16.m +-------------------- This script creates the tiny coefficient set. The script contains an example how to customize the input/output rates matrix and in a simple @@ -24,8 +24,8 @@ be done by editing file src_param.m directly. Note that int16 presentation for SRC coefficients will degrade even the default quality. -src_generate.m --------------- +sof_src_generate.m +------------------ Creates the header files to include to C into directory "include". A report of create modes is written to directory "reports". The diff --git a/src/audio/src/tune/src_generate.m b/src/audio/src/tune/sof_src_generate.m similarity index 98% rename from src/audio/src/tune/src_generate.m rename to src/audio/src/tune/sof_src_generate.m index 85809b23b60e..3cccea514d89 100644 --- a/src/audio/src/tune/src_generate.m +++ b/src/audio/src/tune/sof_src_generate.m @@ -1,8 +1,8 @@ -function src_generate(fs_in, fs_out, fs_inout, cfg); +function sof_src_generate(fs_in, fs_out, fs_inout, cfg); -% src_generate - export src conversions for given fs_in and fs_out +% sof_src_generate - export src conversions for given fs_in and fs_out % -% src_generate(fs_in, fs_out <, fs_inout, >) +% sof_src_generate(fs_in, fs_out <, fs_inout, >) % % fs_in - vector of input sample rates (M) % fs_out - vector of output sample rates (N) diff --git a/src/audio/src/tune/src_ipc4_int32.m b/src/audio/src/tune/sof_src_ipc4_int32.m similarity index 96% rename from src/audio/src/tune/src_ipc4_int32.m rename to src/audio/src/tune/sof_src_ipc4_int32.m index 0ecf988153e3..e1563b37cfaa 100644 --- a/src/audio/src/tune/src_ipc4_int32.m +++ b/src/audio/src/tune/sof_src_ipc4_int32.m @@ -34,4 +34,4 @@ cfg.speed = 0; cfg.gain = 0; % Make gain 0 dB -src_generate(fs1, fs2, fs_matrix, cfg); +sof_src_generate(fs1, fs2, fs_matrix, cfg); diff --git a/src/audio/src/tune/src_small_int32.m b/src/audio/src/tune/sof_src_small_int32.m similarity index 93% rename from src/audio/src/tune/src_small_int32.m rename to src/audio/src/tune/sof_src_small_int32.m index 4e4866b5ed02..3583aa2a75e5 100644 --- a/src/audio/src/tune/src_small_int32.m +++ b/src/audio/src/tune/sof_src_small_int32.m @@ -25,4 +25,4 @@ cfg.speed = 0; cfg.gain = 0; -src_generate(fs1, fs2, fs_matrix, cfg); +sof_src_generate(fs1, fs2, fs_matrix, cfg); diff --git a/src/audio/src/tune/src_std_int32.m b/src/audio/src/tune/sof_src_std_int32.m similarity index 98% rename from src/audio/src/tune/src_std_int32.m rename to src/audio/src/tune/sof_src_std_int32.m index dd6f62f5c875..81e6f98d20fd 100644 --- a/src/audio/src/tune/src_std_int32.m +++ b/src/audio/src/tune/sof_src_std_int32.m @@ -54,4 +54,4 @@ cfg.speed = 0; cfg.gain = 0; -src_generate(fs1, fs2, fs_matrix, cfg); +sof_src_generate(fs1, fs2, fs_matrix, cfg); diff --git a/src/audio/src/tune/src_tiny_int16.m b/src/audio/src/tune/sof_src_tiny_int16.m similarity index 98% rename from src/audio/src/tune/src_tiny_int16.m rename to src/audio/src/tune/sof_src_tiny_int16.m index bedab896a3ee..26dfdf3bae4e 100644 --- a/src/audio/src/tune/src_tiny_int16.m +++ b/src/audio/src/tune/sof_src_tiny_int16.m @@ -45,4 +45,4 @@ cfg.speed = 1; cfg.gain = 0; -src_generate(fs1, fs2, fsm, cfg); +sof_src_generate(fs1, fs2, fsm, cfg);