Skip to content

Commit

Permalink
Audio: Tune: Change file suffix from .blob to bin
Browse files Browse the repository at this point in the history
To align the suffix for binary blob files for UCM cset-tlv
and sof-ctl the file naming is changed from .blob to .bin.
The .bin is better associated for binary files.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
  • Loading branch information
singalsu committed Dec 19, 2024
1 parent 4737a4d commit e676b9a
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions src/audio/crossover/tune/sof_example_crossover.m
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ function export_crossover(cr)
tplg1_fn = sprintf('%s/coef_%s_%s_%s.m4', tpath1, str_way, str_freq, str_pid); % Control Bytes File
tplg2_fn = sprintf('%s/coef_%s_%s_%s.conf', tpath2, str_way, str_freq, str_pid);
% Use those files with sof-ctl to update the component's configuration
blob3_fn = sprintf('%s/coef_%dway.blob', ctlpath3, cr.num_sinks); % Blob binary file
blob3_fn = sprintf('%s/coef_%dway.bin', ctlpath3, cr.num_sinks); % Blob binary file
alsa3_fn = sprintf('%s/coef_%dway.txt', ctlpath3, cr.num_sinks); % ALSA CSV format file
blob4_fn = sprintf('%s/coef_%dway.blob', ctlpath4, cr.num_sinks); % Blob binary file
blob4_fn = sprintf('%s/coef_%dway.bin', ctlpath4, cr.num_sinks); % Blob binary file
alsa4_fn = sprintf('%s/coef_%dway.txt', ctlpath4, cr.num_sinks); % ALSA CSV format file

% This array is an example on how to assign a buffer from pipeline 1 to output 0,
Expand Down
4 changes: 2 additions & 2 deletions src/audio/dcblock/tune/sof_example_dcblock.m
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ function dcblock_blob_calculate(prm)
tplg1_fn = sprintf("%s/topology1/m4/dcblock_coef_%s.m4", sof_tplg, prm.id); % Control Bytes File
tplg2_fn = sprintf("%s/topology2/include/components/dcblock/%s.conf", sof_tplg, prm.id);
% Use those files with sof-ctl to update the component's configuration
blob3_fn = sprintf("%s/ipc3/dcblock/coef_%s.blob", sof_ctl, prm.id); % Blob binary file
blob3_fn = sprintf("%s/ipc3/dcblock/coef_%s.bin", sof_ctl, prm.id); % Blob binary file
alsa3_fn = sprintf("%s/ipc3/dcblock/coef_%s.txt", sof_ctl, prm.id); % ALSA CSV format file
blob4_fn = sprintf("%s/ipc4/dcblock/coef_%s.blob", sof_ctl, prm.id); % Blob binary file
blob4_fn = sprintf("%s/ipc4/dcblock/coef_%s.bin", sof_ctl, prm.id); % Blob binary file
alsa4_fn = sprintf("%s/ipc4/dcblock/coef_%s.txt", sof_ctl, prm.id); % ALSA CSV format file

endian = "little";
Expand Down
4 changes: 2 additions & 2 deletions src/audio/drc/tune/sof_example_drc.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ function drc_coefs_and_config_export(params, id)
tplg1_fn = sprintf("%s/topology1/m4/drc_coef_%s.m4", sof_tplg, id); % Control Bytes File
tplg2_fn = sprintf("%s/topology2/include/components/drc/%s.conf", sof_tplg, id); % Control Bytes File
% Use those files with sof-ctl to update the component's configuration
blob3_fn = sprintf("%s/ipc3/drc_coef_%s.blob", sof_ctl, id); % Blob binary file
blob3_fn = sprintf("%s/ipc3/drc_coef_%s.bin", sof_ctl, id); % Blob binary file
alsa3_fn = sprintf("%s/ipc3/drc_coef_%s.txt", sof_ctl, id); % ALSA CSV format file
blob4_fn = sprintf("%s/ipc4/drc/%s.blob", sof_ctl, id); % Blob binary file
blob4_fn = sprintf("%s/ipc4/drc/%s.bin", sof_ctl, id); % Blob binary file
alsa4_fn = sprintf("%s/ipc4/drc/%s.txt", sof_ctl, id); % ALSA CSV format file

endian = "little";
Expand Down
8 changes: 4 additions & 4 deletions src/audio/eq_iir/tune/sof_example_fir_eq.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function sof_example_fir_eq()
%% -------------------
%% Example 1: Loudness
%% -------------------
fn.bin = 'loudness.blob';
fn.bin = 'loudness.bin';
fn.txt = 'loudness.txt';
fn.tplg1 = 'eq_fir_coef_loudness.m4';
fn.tplg2 = 'loudness.conf';
Expand Down Expand Up @@ -55,7 +55,7 @@ function sof_example_fir_eq()
%% -------------------
%% Example 2: Mid boost
%% -------------------
fn.bin = 'mid.blob';
fn.bin = 'mid.bin';
fn.txt = 'mid.txt';
fn.tplg1 = 'eq_fir_coef_mid.m4';
fn.tplg2 = 'midboost.conf';
Expand All @@ -82,7 +82,7 @@ function sof_example_fir_eq()
%% -------------------
%% Example 3: Flat EQ
%% -------------------
fn.bin = 'flat.blob';
fn.bin = 'flat.bin';
fn.txt = 'flat.txt';
fn.tplg1 = 'eq_fir_coef_flat.m4';
fn.tplg2 = 'flat.conf';
Expand All @@ -109,7 +109,7 @@ function sof_example_fir_eq()
%% --------------------------
%% Example 4: Pass-through EQ
%% --------------------------
fn.bin = 'pass.blob';
fn.bin = 'pass.bin';
fn.txt = 'pass.txt';
fn.tplg1 = 'eq_fir_coef_pass.m4';
fn.tplg2 = 'passthrough.conf';
Expand Down
2 changes: 1 addition & 1 deletion src/audio/eq_iir/tune/sof_example_iir_bandsplit.m
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function sof_example_iir_bandsplit()
%% --------------------------------------------------
%% Example: Band-split 2ch to 4ch low and high bands
%% --------------------------------------------------
blob_fn = fullfile(cpath, 'bandsplit.blob');
blob_fn = fullfile(cpath, 'bandsplit.bin');
alsa_fn = fullfile(cpath, 'bandsplit.txt');
tplg_fn = fullfile(tpath, 'eq_iir_bandsplit.m4');
comment = 'Bandsplit, created with example_iir_bandsplit.m';
Expand Down
14 changes: 7 additions & 7 deletions src/audio/eq_iir/tune/sof_example_iir_eq.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function sof_example_iir_eq()
%% -------------------
%% Example 1: Loudness
%% -------------------
fn.bin = 'loudness.blob';
fn.bin = 'loudness.bin';
fn.txt = 'loudness.txt';
fn.tplg1 = 'eq_iir_coef_loudness.m4';
fn.tplg2 = 'loudness.conf';
Expand Down Expand Up @@ -55,7 +55,7 @@ function sof_example_iir_eq()
%% ------------------------------------
%% Example 2: Bass boost
%% ------------------------------------
fn.bin = 'bassboost.blob';
fn.bin = 'bassboost.bin';
fn.txt = 'bassboost.txt';
fn.tplg1 = 'eq_iir_coef_bassboost.m4';
fn.tplg2 = 'bassboost.conf';
Expand All @@ -82,7 +82,7 @@ function sof_example_iir_eq()
%% ------------------------------------
%% Example 3: Band-pass
%% ------------------------------------
fn.bin = 'bandpass.blob';
fn.bin = 'bandpass.bin';
fn.txt = 'bandpass.txt';
fn.tplg1 = 'eq_iir_coef_bandpass.m4';
fn.tplg2 = 'bandpass.conf';
Expand All @@ -109,7 +109,7 @@ function sof_example_iir_eq()
%% -------------------
%% Example 4: Flat IIR
%% -------------------
fn.bin = 'flat.blob';
fn.bin = 'flat.bin';
fn.txt = 'flat.txt';
fn.tplg1 = 'eq_iir_coef_flat.m4';
fn.tplg2 = 'flat.conf';
Expand All @@ -136,7 +136,7 @@ function sof_example_iir_eq()
%% ---------------------------
%% Example 5: Pass-through IIR
%% ---------------------------
fn.bin = 'pass.blob';
fn.bin = 'pass.bin';
fn.txt = 'pass.txt';
fn.tplg1 = 'eq_iir_coef_pass.m4';
fn.tplg2 = 'passthrough.conf';
Expand Down Expand Up @@ -180,7 +180,7 @@ function sof_example_iir_eq()
fn.txt = sprintf('highpass_%dhz_%ddb_%dkhz.txt', fc, g, fsk);
comment = sprintf('%d Hz second order high-pass, gain %d dB, created with sof_example_iir_eq.m', ...
fc, g);
fn.bin = sprintf('highpass_%dhz_%ddb_%dkhz.blob', fc, g, fsk);
fn.bin = sprintf('highpass_%dhz_%ddb_%dkhz.bin', fc, g, fsk);

%% Design IIR high-pass
eq_hp = hp_iir_eq(fs, fc, g);
Expand All @@ -207,7 +207,7 @@ function sof_example_iir_eq()
%% Example 7: Merge previous desigs to single blob for use as presets
%% ------------------------------------------------------------------

fn.bin = 'bundle.blob';
fn.bin = 'bundle.bin';
fn.txt = 'bundle.txt';
fn.tplg1 = 'eq_iir_bundle.m4';
fn.tplg2 = 'bundle.conf';
Expand Down
4 changes: 2 additions & 2 deletions src/audio/eq_iir/tune/sof_example_spk_eq.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ function sof_example_spk_eq()

%% File names
fir.txt = 'spk.txt';
fir.bin = 'spk.blob';
fir.bin = 'spk.bin';
fir.tplg1 = 'eq_fir_coef_spk.m4';
fir.tplg2 = 'example_speaker.conf';
iir.txt = 'spk.txt';
iir.bin = 'spk.blob';
iir.bin = 'spk.bin';
iir.tplg1 = 'eq_iir_coef_spk.m4';
iir.tplg2 = 'example_speaker.conf';

Expand Down
4 changes: 2 additions & 2 deletions src/audio/multiband_drc/tune/sof_example_multiband_drc.m
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ function export_multiband_drc(prm)
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("%s/ctl/ipc3/multiband_drc/%s.blob", sof_tools, prm.name); % Blob binary file
blob3_fn = sprintf("%s/ctl/ipc3/multiband_drc/%s.bin", 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
blob4_fn = sprintf("%s/ctl/ipc4/multiband_drc/%s.bin", 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

0 comments on commit e676b9a

Please sign in to comment.