Skip to content

Audio: Multiband-DRC: Move blob configuration scripts to module directory #9216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 2 commits into from
Sep 10, 2024
Merged

Audio: Multiband-DRC: Move blob configuration scripts to module directory #9216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd0ff61
Audio: Multiband-DRC: Move blob configuration scripts to module direc…
singalsu Jun 10, 2024
b356e10
Audio: Multiband-DRC: Fix paths after move of scripts
singalsu Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...multiband_drc/crossover_gen_quant_coefs.m → ...band_drc/tune/crossover_gen_quant_coefs.m
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions .../tune/multiband_drc/drc_gen_quant_coefs.m → .../multiband_drc/tune/drc_gen_quant_coefs.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
function drc_coefs = drc_gen_quant_coefs(num_bands, sample_rate, params);

addpath ../drc

for i = 1:num_bands
coefs = drc_gen_coefs(params(i), sample_rate);
drc_coefs(i) = drc_generate_config(coefs);
end

rmpath ../drc

end
20 changes: 12 additions & 8 deletions ...une/multiband_drc/example_multiband_drc.m → ...ultiband_drc/tune/example_multiband_drc.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@ function example_multiband_drc()

function export_multiband_drc(prm)

multiband_drc_paths(true);

% Set the parameters here
tplg1_fn = sprintf("../../topology/topology1/m4/multiband_drc_coef_%s.m4", prm.name); % Control Bytes File
tplg2_fn = sprintf("../../topology/topology2/include/components/multiband_drc/%s.conf", prm.name); % Control Bytes File
sof_tools = '../../../../tools';
tplg1_fn = sprintf("%s/topology/topology1/m4/multiband_drc_coef_%s.m4", sof_tools, prm.name); % Control Bytes File
tplg2_fn = sprintf("%s/topology/topology2/include/components/multiband_drc/%s.conf", sof_tools, prm.name); % Control Bytes File
% Use those files with sof-ctl to update the component's configuration
blob3_fn = sprintf("../../ctl/ipc3/multiband_drc/%s.blob", prm.name); % Blob binary file
alsa3_fn = sprintf("../../ctl/ipc3/multiband_drc/%s.txt", prm.name); % ALSA CSV format file
blob4_fn = sprintf("../../ctl/ipc4/multiband_drc/%s.blob", prm.name); % Blob binary file
alsa4_fn = sprintf("../../ctl/ipc4/multiband_drc/%s.txt", prm.name); % ALSA CSV format file
blob3_fn = sprintf("%s/ctl/ipc3/multiband_drc/%s.blob", sof_tools, prm.name); % Blob binary file
alsa3_fn = sprintf("%s/ctl/ipc3/multiband_drc/%s.txt", sof_tools, prm.name); % ALSA CSV format file
blob4_fn = sprintf("%s/ctl/ipc4/multiband_drc/%s.blob", sof_tools, prm.name); % Blob binary file
alsa4_fn = sprintf("%s/ctl/ipc4/multiband_drc/%s.txt", sof_tools, prm.name); % ALSA CSV format file

endian = "little";

Expand Down Expand Up @@ -116,6 +119,8 @@ function export_multiband_drc(prm)
drc_params(4).band_lower_freq = prm.band_lower_freq(4) / nyquist;

% Generate Emphasis/Deemphasis IIR filter quantized coefs struct from parameters


[emp_coefs, deemp_coefs] = iir_gen_quant_coefs(iir_params);

% Generate Crossover quantized coefs struct from parameters
Expand All @@ -128,7 +133,6 @@ function export_multiband_drc(prm)
drc_coefs = drc_gen_quant_coefs(num_bands, sample_rate, drc_params);

% Generate output files
addpath ../common

% Convert quantized coefs structs to binary blob
blob8 = multiband_drc_build_blob(num_bands, enable_emp_deemp, emp_coefs, ...
Expand All @@ -145,6 +149,6 @@ function export_multiband_drc(prm)
sof_ucm_blob_write(blob4_fn, blob8_ipc4);
alsactl_write(alsa4_fn, blob8_ipc4);

rmpath ../common
multiband_drc_paths(false);

end
4 changes: 0 additions & 4 deletions .../tune/multiband_drc/iir_gen_quant_coefs.m → .../multiband_drc/tune/iir_gen_quant_coefs.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
bits_gain = 16; % Q2.14
qf_gain = 14;

addpath ../eq

quant_coefs = cell(1, 2);
for i = 1:length(coefs)
coef = cell2mat(coefs(i));
Expand All @@ -88,8 +86,6 @@

quant_coefs = cell2mat(quant_coefs);

rmpath ../eq

end

function [bq1, bq2] = stage_gain_adjust(prev_bq1, prev_bq2)
Expand Down
0 .../multiband_drc/multiband_drc_build_blob.m → ...iband_drc/tune/multiband_drc_build_blob.m
View file
Open in desktop
File renamed without changes.
33 changes: 33 additions & 0 deletions src/audio/multiband_drc/tune/multiband_drc_paths.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
function multiband_drc_paths(enable)

% multiband_drc_paths(enable)
% enable - set to true to enable needed search path
% set to false to disable the search paths
%

% SPDX-License-Identifier: BSD-3-Clause
%
% Copyright (c) 2024, Intel Corporation. All rights reserved.

common = '../../../../tools/tune/common';
crossover = '../../../../tools/tune/crossover';
drc = '../../../../tools/tune/drc';
eq = '../../../../tools/tune/eq';
# After #9215 merge use this:
# crossover = '../../crossover/tune';
# After #9188 merge use this:
# drc = '../../drc/tune';
# After #9187 merge use this:
# eq = '../../eq_iir/tune';
Comment on lines +12 to +21
Copy link
Member

@lgirdwood lgirdwood Jun 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, does Matlab/Octave support PATHs via environment variable ? If so, might be easiest to have a script that sets these for the (like Zephyr has convenience script to setup build environment)

Copy link
Collaborator Author

@singalsu singalsu Aug 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the environment variables can be supported:

octave:1> getenv('SOF_WORKSPACE')
ans = /home/singalsu/work/current/sof

Would above be better e.g. as tune = sprintf('%s/sof/tools/tune', getenv('SOF_WORKSPACE')); ?

Copy link
Member

@lgirdwood lgirdwood Aug 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, lets track this as a long term feature - ideally long term west would enable this when we configure the environment.

if enable
addpath(common);
addpath(crossover);
addpath(drc);
addpath(eq);
else
rmpath(common);
rmpath(crossover);
rmpath(drc);
rmpath(eq);
end
end