Audio: TDFB: Tune: Add export of beamformer blobs for ALSA UCM

This change adds generate of multi-microphone beamformer blobs to
apply with UCM2 rules for SOF.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

Author: singalsu

src/audio/tdfb/tune/sof_bf_defaults.m

@@ -19,6 +19,8 @@
 bf.array_angle = [0 0 0]; % Array rotation angles for xyz
 bf.tplg_fn = '';
 bf.sofctl_fn = '';
+bf.ucmbin3_fn = '';
+bf.ucmbin4_fn = '';
 sof_tools = '../../../../tools';
 bf.tplg1_path = fullfile(sof_tools, 'topology/topology1/m4/tdfb');
 bf.tplg2_path = fullfile(sof_tools, 'topology/topology2/include/components/tdfb');

src/audio/tdfb/tune/sof_bf_export.m

@@ -3,6 +3,8 @@
 % Inputs
 % bf.sofctl3_fn .... filename of ascii text format blob
 % bf.sofctl4_fn .... filename of ascii text format blob
+% bf.ucmbin3_fn .... filename of binary format blob for UCM (IPC3)
+% bf.ucmbin4_fn .... filename of binary format blob for UCM (IPC4)
 % bf.tplg1_fn ...... filename of topology m4 format blob
 % bf.tplg2_fn ...... filename of topology m4 format blob
 % bf ............... the design procedure output
@@ -116,6 +118,18 @@
 	tplg2_write(bf.tplg2_fn, bp4, "tdfb_config", export_note, bf.export_howto);
 end
 
+if ~isempty(bf.ucmbin3_fn)
+	fprintf(1, 'Exporting to %s\n', bf.ucmbin3_fn);
+	mkdir_check(bf.sofctl3_path);
+	sof_ucm_blob_write(bf.ucmbin3_fn, bp3);
+end
+
+if ~isempty(bf.ucmbin4_fn)
+	fprintf(1, 'Exporting to %s\n', bf.ucmbin4_fn);
+	mkdir_check(bf.sofctl4_path);
+	sof_ucm_blob_write(bf.ucmbin4_fn, bp4);
+end
+
 sof_bf_paths(false);
 
 end

src/audio/tdfb/tune/sof_bf_filenames_helper.m

@@ -53,6 +53,8 @@
 bf.sofctl3_fn = fullfile(bf.sofctl3_path, sprintf('coef_%s.txt', idstr));
 bf.tplg1_fn = fullfile(bf.tplg1_path, sprintf('coef_%s.m4', idstr));
 bf.sofctl4_fn = fullfile(bf.sofctl4_path, sprintf('%s.txt', idstr));
+bf.ucmbin3_fn = fullfile(bf.sofctl3_path, sprintf('%s.bin', idstr));
+bf.ucmbin4_fn = fullfile(bf.sofctl4_path, sprintf('%s.bin', idstr));
 bf.tplg2_fn = fullfile(bf.tplg2_path, sprintf('%s.conf', idstr));
 
 

src/audio/tdfb/tune/sof_bf_line2_two_beams.m

@@ -63,6 +63,8 @@ function sof_bf_line2_two_beams(fs, d, a1, a2, fn, prm)
 bfm.sofctl3_fn = fullfile(bfm.sofctl3_path, fn.sofctl3_fn);
 bfm.tplg1_fn = fullfile(bfm.tplg1_path, fn.tplg1_fn);
 bfm.sofctl4_fn = fullfile(bfm.sofctl4_path, fn.sofctl4_fn);
+bfm.ucmbin3_fn = fullfile(bfm.sofctl3_path, fn.ucmbin3_fn);
+bfm.ucmbin4_fn = fullfile(bfm.sofctl4_path, fn.ucmbin4_fn);
 bfm.tplg2_fn = fullfile(bfm.tplg2_path, fn.tplg2_fn);
 
 % Export files for topology and sof-ctl

src/audio/tdfb/tune/sof_bf_line4_two_beams.m

@@ -63,6 +63,8 @@ function sof_bf_line4_two_beams(fs, d, a1, a2, fn, prm)
 bfm.sofctl3_fn = fullfile(bfm.sofctl3_path, fn.sofctl3_fn);
 bfm.tplg1_fn = fullfile(bfm.tplg1_path, fn.tplg1_fn);
 bfm.sofctl4_fn = fullfile(bfm.sofctl4_path, fn.sofctl4_fn);
+bfm.ucmbin3_fn = fullfile(bfm.sofctl3_path, fn.ucmbin3_fn);
+bfm.ucmbin4_fn = fullfile(bfm.sofctl4_path, fn.ucmbin4_fn);
 bfm.tplg2_fn = fullfile(bfm.tplg2_path, fn.tplg2_fn);
 
 % Export files for topology and sof-ctl

src/audio/tdfb/tune/sof_example_pass_config.m

@@ -34,6 +34,8 @@ function sof_example_pass_config()
 bf.sofctl3_fn = fullfile(bf.sofctl3_path, 'coef_line2_pass.txt');
 bf.tplg1_fn = fullfile(bf.tplg1_path, 'coef_line2_pass.m4');
 bf.sofctl4_fn = fullfile(bf.sofctl4_path, 'line2_pass.txt');
+bf.ucmbin3_fn = fullfile(bf.sofctl3_path, 'line2_pass.bin');
+bf.ucmbin4_fn = fullfile(bf.sofctl4_path, 'line2_pass.bin');
 bf.tplg2_fn = fullfile(bf.tplg2_path, 'line2_pass.conf');
 sof_bf_export(bf);
 
@@ -52,6 +54,8 @@ function sof_example_pass_config()
 bf.sofctl3_fn = fullfile(bf.sofctl3_path, 'coef_line4_pass.txt');
 bf.tplg1_fn = fullfile(bf.tplg1_path, 'coef_line4_pass.m4');
 bf.sofctl4_fn = fullfile(bf.sofctl4_path, 'line4_pass.txt');
+bf.ucmbin3_fn = fullfile(bf.sofctl3_path, 'line4_pass.bin');
+bf.ucmbin4_fn = fullfile(bf.sofctl4_path, 'line4_pass.bin');
 bf.tplg2_fn = fullfile(bf.tplg2_path, 'line4_pass.conf');
 sof_bf_export(bf);
 
@@ -72,6 +76,8 @@ function sof_example_pass_config()
 bf.sofctl3_fn = fullfile(bf.sofctl3_path, 'coef_line4to2_pass.txt');
 bf.tplg1_fn = fullfile(bf.tplg1_path, 'coef_line4to2_pass.m4');
 bf.sofctl4_fn = fullfile(bf.sofctl4_path, 'line4to2_pass.txt');
+bf.ucmbin3_fn = fullfile(bf.sofctl3_path, 'line4to2_pass.bin');
+bf.ucmbin4_fn = fullfile(bf.sofctl4_path, 'line4to2_pass.bin');
 bf.tplg2_fn = fullfile(bf.tplg2_path, 'line4to2_pass.conf');
 sof_bf_export(bf);
 

src/audio/tdfb/tune/sof_example_two_beams.m

@@ -29,65 +29,37 @@ function sof_example_two_beams()
 for fs = [16e3 48e3]
 	%% Close all plots to avoid issues with large number of windows
 	close all;
+	a1 = az;   % Azimuth +az deg
+	a2 = -az;  % Azimuth -az deg
 
 	%% 2 mic 50 mm array
-	fn.tplg1_fn = sprintf('coef_line2_50mm_pm%sdeg_%dkhz.m4', azstr, fs/1e3);
-	fn.sofctl3_fn = sprintf('coef_line2_50mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
-	fn.tplg2_fn = sprintf('line2_50mm_pm%sdeg_%dkhz.conf', azstr, fs/1e3);
-	fn.sofctl4_fn = sprintf('line2_50mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
 	d = 50e-3;  % 50 mm spacing
-	a1 = az;   % Azimuth +az deg
-	a2 = -az;  % Azimuth -az deg
+	fn = export_names_helper('line2', azstr, d, fs);
 	sof_bf_line2_two_beams(fs, d, a1, a2, fn, prm);
 
 	%% 2 mic 68 mm array
-	fn.tplg1_fn = sprintf('coef_line2_68mm_pm%sdeg_%dkhz.m4', azstr, fs/1e3);
-	fn.sofctl3_fn = sprintf('coef_line2_68mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
-	fn.tplg2_fn = sprintf('line2_68mm_pm%sdeg_%dkhz.conf', azstr, fs/1e3);
-	fn.sofctl4_fn = sprintf('line2_68mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
 	d = 68e-3;  % 68 mm spacing
-	a1 = az;   % Azimuth +az deg
-	a2 = -az;  % Azimuth -az deg
+	fn = export_names_helper('line2', azstr, d, fs);
 	sof_bf_line2_two_beams(fs, d, a1, a2, fn, prm);
 
 	%% 2 mic 73.5 mm array
-	fn.tplg1_fn = sprintf('coef_line2_74mm_pm%sdeg_%dkhz.m4', azstr, fs/1e3);
-	fn.sofctl3_fn = sprintf('coef_line2_74mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
-	fn.tplg2_fn = sprintf('line2_74mm_pm%sdeg_%dkhz.conf', azstr, fs/1e3);
-	fn.sofctl4_fn = sprintf('line2_74mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
 	d = 73.5e-3;  % 73.5 mm spacing
-	a1 = az;   % Azimuth +az deg
-	a2 = -az;  % Azimuth -az deg
+	fn = export_names_helper('line2', azstr, d, fs);
 	sof_bf_line2_two_beams(fs, d, a1, a2, fn, prm);
 
 	%% 4 mic 28 mm spaced array
-	fn.tplg1_fn = sprintf('coef_line4_28mm_pm%sdeg_%dkhz.m4', azstr, fs/1e3);
-	fn.sofctl3_fn = sprintf('coef_line4_28mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
-	fn.tplg2_fn = sprintf('line4_28mm_pm%sdeg_%dkhz.conf', azstr, fs/1e3);
-	fn.sofctl4_fn = sprintf('line4_28mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
 	d = 28e-3;  % 28 mm spacing
-	a1 = az;   % Azimuth +az deg
-	a2 = -az;  % Azimuth -az deg
+	fn = export_names_helper('line4', azstr, d, fs);
 	sof_bf_line4_two_beams(fs, d, a1, a2, fn, prm);
 
 	%% 4 mic 68 mm spaced array
-	fn.tplg1_fn = sprintf('coef_line4_68mm_pm%sdeg_%dkhz.m4', azstr, fs/1e3);
-	fn.sofctl3_fn = sprintf('coef_line4_68mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
-	fn.tplg2_fn = sprintf('line4_68mm_pm%sdeg_%dkhz.conf', azstr, fs/1e3);
-	fn.sofctl4_fn = sprintf('line4_68mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
 	d = 68e-3;  % 68 mm spacing
-	a1 = az;   % Azimuth +az deg
-	a2 = -az;  % Azimuth -az deg
+	fn = export_names_helper('line4', azstr, d, fs);
 	sof_bf_line4_two_beams(fs, d, a1, a2, fn, prm);
 
 	%% 4 mic 78 mm spaced array
-	fn.tplg1_fn = sprintf('coef_line4_78mm_pm%sdeg_%dkhz.m4', azstr, fs/1e3);
-	fn.sofctl3_fn = sprintf('coef_line4_78mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
-	fn.tplg2_fn = sprintf('line4_78mm_pm%sdeg_%dkhz.conf', azstr, fs/1e3);
-	fn.sofctl4_fn = sprintf('line4_78mm_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
 	d = 78e-3;  % 78 mm spacing
-	a1 = az;   % Azimuth +az deg
-	a2 = -az;  % Azimuth -az deg
+	fn = export_names_helper('line4', azstr, d, fs);
 	sof_bf_line4_two_beams(fs, d, a1, a2, fn, prm);
 end
 
@@ -268,3 +240,17 @@ function line_xyz(fs)
 sof_bf_export(bfm);
 
 end
+
+function fn = export_names_helper(arrayname, azstr, d, fs)
+
+mmstr = sprintf('%dmm', round(d * 1e3));
+fsstr = sprintf('%dkhz', round(fs/1e3));
+fn.tplg1_fn = sprintf('coef_%s_%s_pm%sdeg_%s.m4', arrayname, mmstr, azstr, fsstr);
+fn.tplg2_fn = sprintf('%s_%s_pm%sdeg_%s.conf', arrayname, mmstr, azstr, fsstr);
+fn.sofctl3_fn = sprintf('%s_%s_pm%sdeg_%s.txt', arrayname, mmstr, azstr, fsstr);
+fn.sofctl4_fn = sprintf('%s_%s_pm%sdeg_%s.txt', arrayname, mmstr, azstr, fsstr);
+fn.ucmbin3_fn = sprintf('%s_%s_pm%sdeg_%s.bin', arrayname, mmstr, azstr, fsstr);
+fn.ucmbin4_fn = sprintf('%s_%s_pm%sdeg_%s.bin', arrayname, mmstr, azstr, fsstr);
+
+end
+

src/audio/tdfb/tune/sof_example_two_beams_default.m

@@ -35,6 +35,8 @@ function sof_example_two_beams_default()
 	fn.sofctl3_fn = sprintf('coef_line2_generic_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
 	fn.tplg2_fn = sprintf('line2_generic_pm%sdeg_%dkhz.conf', azstr, fs/1e3);
 	fn.sofctl4_fn = sprintf('line2_generic_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
+	fn.ucmbin3_fn = sprintf('line2_generic_pm%sdeg_%dkhz.bin', azstr, fs/1e3);
+	fn.ucmbin4_fn = sprintf('line2_generic_pm%sdeg_%dkhz.bin', azstr, fs/1e3);
 	d = 50e-3;  % 50 mm spacing
 	a1 = az;   % Azimuth +az deg
 	a2 = -az;  % Azimuth -az deg
@@ -45,6 +47,8 @@ function sof_example_two_beams_default()
 	fn.sofctl3_fn = sprintf('coef_line4_generic_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
 	fn.tplg2_fn = sprintf('line4_generic_pm%sdeg_%dkhz.conf', azstr, fs/1e3);
 	fn.sofctl4_fn = sprintf('line4_generic_pm%sdeg_%dkhz.txt', azstr, fs/1e3);
+	fn.ucmbin3_fn = sprintf('line4_generic_pm%sdeg_%dkhz.bin', azstr, fs/1e3);
+	fn.ucmbin4_fn = sprintf('line4_generic_pm%sdeg_%dkhz.bin', azstr, fs/1e3);
 	d = 40e-3; % 40 mm spacing
 	a1 = az;   % Azimuth +az deg
 	a2 = -az;  % Azimuth -az deg