From e26b072fc33a9ffd610865e2ff4be3785c010d5a Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Thu, 19 Dec 2024 20:16:16 +0200 Subject: [PATCH] Audio: Tune: Change file suffix from .blob to bin 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 --- src/audio/crossover/tune/sof_example_crossover.m | 4 ++-- src/audio/dcblock/tune/sof_example_dcblock.m | 4 ++-- src/audio/drc/tune/sof_example_drc.m | 4 ++-- src/audio/eq_iir/tune/sof_example_fir_eq.m | 8 ++++---- src/audio/eq_iir/tune/sof_example_iir_bandsplit.m | 2 +- src/audio/eq_iir/tune/sof_example_iir_eq.m | 14 +++++++------- src/audio/eq_iir/tune/sof_example_spk_eq.m | 4 ++-- .../multiband_drc/tune/sof_example_multiband_drc.m | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/audio/crossover/tune/sof_example_crossover.m b/src/audio/crossover/tune/sof_example_crossover.m index 1d588a1a2565..6d642122aab6 100644 --- a/src/audio/crossover/tune/sof_example_crossover.m +++ b/src/audio/crossover/tune/sof_example_crossover.m @@ -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, diff --git a/src/audio/dcblock/tune/sof_example_dcblock.m b/src/audio/dcblock/tune/sof_example_dcblock.m index cf818bf4f6bf..cf6d856656a3 100644 --- a/src/audio/dcblock/tune/sof_example_dcblock.m +++ b/src/audio/dcblock/tune/sof_example_dcblock.m @@ -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"; diff --git a/src/audio/drc/tune/sof_example_drc.m b/src/audio/drc/tune/sof_example_drc.m index 671f05273938..febf320aad99 100644 --- a/src/audio/drc/tune/sof_example_drc.m +++ b/src/audio/drc/tune/sof_example_drc.m @@ -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"; diff --git a/src/audio/eq_iir/tune/sof_example_fir_eq.m b/src/audio/eq_iir/tune/sof_example_fir_eq.m index 29a69f94a219..a1e47396ce7e 100644 --- a/src/audio/eq_iir/tune/sof_example_fir_eq.m +++ b/src/audio/eq_iir/tune/sof_example_fir_eq.m @@ -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'; @@ -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'; @@ -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'; @@ -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'; diff --git a/src/audio/eq_iir/tune/sof_example_iir_bandsplit.m b/src/audio/eq_iir/tune/sof_example_iir_bandsplit.m index b8561b5074ba..37a34342c678 100644 --- a/src/audio/eq_iir/tune/sof_example_iir_bandsplit.m +++ b/src/audio/eq_iir/tune/sof_example_iir_bandsplit.m @@ -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'; diff --git a/src/audio/eq_iir/tune/sof_example_iir_eq.m b/src/audio/eq_iir/tune/sof_example_iir_eq.m index 94b015671509..69449164394b 100644 --- a/src/audio/eq_iir/tune/sof_example_iir_eq.m +++ b/src/audio/eq_iir/tune/sof_example_iir_eq.m @@ -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'; @@ -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'; @@ -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'; @@ -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'; @@ -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'; @@ -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); @@ -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'; diff --git a/src/audio/eq_iir/tune/sof_example_spk_eq.m b/src/audio/eq_iir/tune/sof_example_spk_eq.m index 5acc7a304172..3a91ae04db6a 100644 --- a/src/audio/eq_iir/tune/sof_example_spk_eq.m +++ b/src/audio/eq_iir/tune/sof_example_spk_eq.m @@ -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'; diff --git a/src/audio/multiband_drc/tune/sof_example_multiband_drc.m b/src/audio/multiband_drc/tune/sof_example_multiband_drc.m index 200d0cd4f4ea..9ebd3ef56b97 100644 --- a/src/audio/multiband_drc/tune/sof_example_multiband_drc.m +++ b/src/audio/multiband_drc/tune/sof_example_multiband_drc.m @@ -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";