added more default value arrays

jananifernandez · jananifernandez · commit ad66336d886b · 2025-11-02T14:47:16.000+02:00
diff --git a/examples/include/array2sh.h b/examples/include/array2sh.h
@@ -224,6 +224,12 @@ typedef enum {
 /** Maximum baffle radius supported, mm */
 #define ARRAY2SH_BAFFLE_RADIUS_MAX_VALUE ( 400.0f ) 
 
+/** Default number of microphones */
+extern const int array2sh_defaultNumSensors;
+
+/** Default microphone directions (degrees) */
+extern const float array2sh_defaultSensorsDirections[MAX_NUM_INPUTS][2];
+
 
 /* ========================================================================== */
 /*                               Main Functions                               */
diff --git a/examples/include/beamformer.h b/examples/include/beamformer.h
@@ -44,6 +44,13 @@
 extern "C" {
 #endif /* __cplusplus */
 
+/** Default number of beams */
+extern const int beamformer_defaultNumBeams;
+
+/** Default beam directions */
+extern const float beamformer_defaultBeamDirections[MAX_NUM_INPUTS][2];
+
+
 /* ========================================================================== */
 /*                               Main Functions                               */
 /* ========================================================================== */
diff --git a/examples/include/binauraliser.h b/examples/include/binauraliser.h
@@ -63,7 +63,7 @@ typedef enum {
 /** Default number of Sources */
 extern const int binauraliser_defaultNumSources;
 
-/** Default Loudspeaker directions */
+/** Default source directions */
 extern const float binauraliser_defaultSourceDirections[MAX_NUM_INPUTS][2];
 
 
diff --git a/examples/src/ambi_dec/ambi_dec_internal.c b/examples/src/ambi_dec/ambi_dec_internal.c
@@ -327,6 +327,78 @@ void loadLoudspeakerArrayPreset
         case LOUDSPEAKER_ARRAY_PRESET_22P2_9_10_3:
             saf_print_error("Not suitable, since it contains LFE channels");
             break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_STEREO:
+            nCH = 2;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] =  __protools_stereo_dirs_deg[__protools_mapping_discrete_to_stereo[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_LCR:
+            nCH = 3;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_LCR_dirs_deg[__protools_mapping_discrete_to_LCR[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_QUAD:
+            nCH = 4;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_Quad_dirs_deg[__protools_mapping_discrete_to_Quad[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_5_0:
+            nCH = 5;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_5p0_dirs_deg[__protools_mapping_discrete_to_5p0[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_5_0_2:
+            nCH = 7;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_5p0p2_dirs_deg[__protools_mapping_discrete_to_5p0p2[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_5_0_4:
+            nCH = 9;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_5p0p4_dirs_deg[__protools_mapping_discrete_to_5p0p4[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_7_0:
+            nCH = 7;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_7p0_dirs_deg[__protools_mapping_discrete_to_7p0[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_7_0_2:
+            nCH = 9;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_7p0p2_dirs_deg[__protools_mapping_discrete_to_7p0p2[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_7_0_4:
+            nCH = 11;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_7p0p4_dirs_deg[__protools_mapping_discrete_to_7p0p4[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_7_0_6:
+            nCH = 13;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_7p0p6_dirs_deg[__protools_mapping_discrete_to_7p0p6[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_9_0_4:
+            nCH = 13;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_9p0p4_dirs_deg[__protools_mapping_discrete_to_9p0p4[ch]][i];
+            break;
+        case LOUDSPEAKER_ARRAY_PRESET_PROTOOLS_9_0_6:
+            nCH = 15;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_9p0p6_dirs_deg[__protools_mapping_discrete_to_9p0p6[ch]][i];
+            break;
         case LOUDSPEAKER_ARRAY_PRESET_AALTO_MCC:
             nCH = 45;
             for(ch=0; ch<nCH; ch++)
diff --git a/examples/src/ambi_enc/ambi_enc_internal.c b/examples/src/ambi_enc/ambi_enc_internal.c
@@ -243,6 +243,78 @@ void loadSourceConfigPreset
         case SOURCE_CONFIG_PRESET_22P2_9_10_3:
             saf_print_error("Not suitable, since it contains LFE channels");
             break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_STEREO:
+            nCH = 2;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_stereo_dirs_deg[__protools_mapping_stereo_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_LCR:
+            nCH = 3;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_LCR_dirs_deg[__protools_mapping_LCR_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_QUAD:
+            nCH = 4;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_Quad_dirs_deg[__protools_mapping_Quad_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_5_0:
+            nCH = 5;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_5p0_dirs_deg[__protools_mapping_5p0_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_5_0_2:
+            nCH = 7;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_5p0p2_dirs_deg[__protools_mapping_5p0p2_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_5_0_4:
+            nCH = 9;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_5p0p4_dirs_deg[__protools_mapping_5p0p4_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_7_0:
+            nCH = 7;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_7p0_dirs_deg[__protools_mapping_7p0_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_7_0_2:
+            nCH = 9;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_7p0p2_dirs_deg[__protools_mapping_7p0p2_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_7_0_4:
+            nCH = 11;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_7p0p4_dirs_deg[__protools_mapping_7p0p4_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_7_0_6:
+            nCH = 13;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_7p0p6_dirs_deg[__protools_mapping_7p0p6_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_9_0_4:
+            nCH = 13;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_9p0p4_dirs_deg[__protools_mapping_9p0p4_to_discrete[ch]][i];
+            break;
+        case SOURCE_CONFIG_PRESET_PROTOOLS_9_0_6:
+            nCH = 15;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __protools_9p0p6_dirs_deg[__protools_mapping_9p0p6_to_discrete[ch]][i];
+            break;
         case SOURCE_CONFIG_PRESET_AALTO_MCC:
             nCH = 45;
             for(ch=0; ch<nCH; ch++)
diff --git a/examples/src/array2sh/array2sh_internal.c b/examples/src/array2sh/array2sh_internal.c
@@ -49,6 +49,138 @@
 
 #include "array2sh_internal.h"
 
+const int array2sh_defaultNumSensors = 4;
+
+const float array2sh_defaultSensorsDirections[MAX_NUM_INPUTS][2] =
+  { { 45.0f,    35.264f},
+    { -45.0f,    -35.264f},
+    { 135.0f,    -35.264f},
+    { -135.0f,    35.264f},
+    { -59.5674172539630f,    -69.7763953095265f},
+    { -107.629493132161f,    10.0801907586439f},
+    { 59.5651193014662f,    69.7750019669784f},
+    { -72.3715136529922f,    -10.0909592824967f},
+    { 120.418832045969f,    -69.7630732527928f},
+    { 72.3705387467529f,    10.0908849630425f},
+    { 10.5699823270029f,    17.3489915451677f},
+    { -169.426851150349f,    17.3476277272366f},
+    { -30.7728814706980f,    68.2546206344998f},
+    { 101.529181734204f,    18.5653877408229f},
+    { 149.250234431564f,    68.2619792676765f},
+    { 18.9183978612362f,    -10.9197242075287f},
+    { 78.4729799557400f,    -18.5558892226653f},
+    { -18.9161109968480f,    10.9195275229078f},
+    { -78.4723066816396f,    18.5565169424192f},
+    { -161.085243560336f,    -10.9220975953767f},
+    { -101.530063994217f,    -18.5648176173994f},
+    { 161.085855454581f,    10.9237834974412f},
+    { 30.7790837424989f,    -68.2562996173874f},
+    { -149.255648697558f,    -68.2594892022576f},
+    { 56.4638592172755f,    41.2645742763346f},
+    { 46.4626904606488f,    24.5386896277818f},
+    { -123.528839291756f,    41.2565889648213f},
+    { 32.1932295461248f,    38.8027347956192f},
+    { 133.534545076742f,    -24.5310453346374f},
+    { -32.1935458377634f,    -38.8041545028931f},
+    { -133.533477606995f,    24.5319420428588f},
+    { -147.797881221742f,    38.7980990097138f},
+    { -46.4626630742447f,    -24.5400749997299f},
+    { 147.799544204027f,    -38.7965984357137f},
+    { -56.4649576930965f,    -41.2658215291547f},
+    { 123.530547454259f,    -41.2555316199835f},
+    { 84.7385596473317f,    27.3132538556364f},
+    { 27.4072860474693f,    4.67593317316088f},
+    { -95.2612516264878f,    27.3036967398252f},
+    { 10.0607591758466f,    62.2287426217158f},
+    { 152.592710471291f,    -4.67007594116539f},
+    { -10.0604693351594f,    -62.2317767049329f},
+    { -152.592615409799f,    4.67188744845125f},
+    { -169.918387889403f,    62.2272712110016f},
+    { -27.4047652820400f,    -4.67684895484045f},
+    { 169.918493477140f,    -62.2246416140826f},
+    { -84.7390238025025f,    -27.3120311727342f},
+    { 95.2622793653641f,    -27.3027426350066f},
+    { 136.272846725200f,    -0.726139068263599f},
+    { -1.05456977390436f,    -46.2698051615206f},
+    { -43.7263256019408f,    -0.737666959763443f},
+    { -91.0084089447853f,    43.7170295842697f},
+    { -178.936314291048f,    46.2682278552731f},
+    { 91.0100541861312f,    -43.7163112498585f},
+    { 178.938490558618f,    -46.2666218304286f},
+    { 88.9860902890987f,    43.7285680951606f},
+    { 1.05095788619312f,    46.2682407577363f},
+    { -88.9851906686018f,    -43.7278600822776f},
+    { -136.273314433943f,    0.726484363994244f},
+    { 43.7273191822901f,    0.733967099281741f},
+    { 55.2321077221357f,    10.8187456245361f},
+    { 13.0867814081219f,    34.0654299770448f},
+    { -124.767898552651f,    10.8099467408727f},
+    { 71.4751302534919f,    53.7984109774923f},
+    { 166.905549455530f,    -34.0625862919868f},
+    { -71.4765158530160f,    -53.8002805142714f},
+    { -166.904587570338f,    34.0633858486074f},
+    { -108.515564585463f,    53.7864186881779f},
+    { -13.0869589355977f,    -34.0644403811701f},
+    { 108.517274377512f,    -53.7853093207457f},
+    { -55.2337689585088f,    -10.8200079671294f},
+    { 124.767519417537f,    -10.8096092876561f},
+    { -105.493359369733f,    -68.1345228940484f},
+    { -111.151973933085f,    -5.71277564515985f},
+    { 74.5244447329726f,    -68.1205741555505f},
+    { -173.885132403874f,    -21.0401043953034f},
+    { -68.8521018079939f,    5.70313885775370f},
+    { 173.885050918764f,    21.0419786777516f},
+    { 68.8513569996117f,    -5.70297394874866f},
+    { 6.12041448982713f,    -21.0387333986971f},
+    { 111.151515131908f,    5.71357243375474f},
+    { -6.11913621739966f,    21.0397756114589f},
+    { 105.487055344890f,    68.1331981897040f},
+    { -74.5188619841755f,    68.1214716326340f},
+    { 35.2822222163987f,    -15.1801841162885f},
+    { -25.1732516880600f,    51.9826514887145f},
+    { -144.722913967824f,    -15.1859965048827f},
+    { 108.386507250934f,    33.8824333892584f},
+    { -154.839566662519f,    -51.9856067440744f},
+    { -108.385758587361f,    -33.8826426573830f},
+    { 154.840828582605f,    51.9884126722963f},
+    { -71.6110721306039f,    33.8714084774643f},
+    { 25.1699762263473f,    -51.9843011897216f},
+    { 71.6126173250777f,    -33.8705490198003f},
+    { -35.2810594358470f,    15.1763090469469f},
+    { 144.722474074749f,    15.1863112389402f},
+    { -125.277803641269f,    -28.5561977838671f},
+    { -146.317489805034f,    -30.4888082061806f},
+    { 54.7220842889970f,    -28.5463137051834f},
+    { -133.292600372594f,    -45.8199818171681f},
+    { -33.6854220654234f,    30.4794807422719f},
+    { 133.295169860873f,    45.8200619710773f},
+    { 33.6830420572493f,    -30.4828689919959f},
+    { 46.7098267598019f,    -45.8106991831118f},
+    { 146.318736830907f,    30.4889588527258f},
+    { -46.7107531920589f,    45.8077510168776f},
+    { 125.278543193551f,    28.5567151663926f},
+    { -54.7226679373581f,    28.5424675755949f},
+    { -144.402199049652f,    54.7141577397485f},
+    { 112.382216591782f,    -28.0100385212576f},
+    { 35.5834085793474f,    54.7193853715013f},
+    { -29.9155874729000f,    -19.6471282266303f},
+    { 67.6163420587218f,    28.0211878299760f},
+    { 29.9151078604395f,    19.6461577548916f},
+    { -67.6164804090156f,    -28.0221553885221f},
+    { 150.081679085309f,    -19.6396879622134f},
+    { -112.381365317985f,    28.0105570315277f},
+    { -150.081127534239f,    19.6412999777121f},
+    { 144.402936805264f,    -54.7127597303097f},
+    { -35.5837994140428f,    -54.7203576209200f},
+    { 68.5348504928164f,    -52.8527273534571f},
+    { -54.8218918027732f,    12.7570858971645f},
+    { -111.464947340552f,    -52.8652964226689f},
+    { 164.510735700738f,    34.1892226850382f},
+    { -125.181243085238f,    -12.7710900404128f},
+    { -164.510172672569f,    -34.1865270720665f},
+    { 125.180742749445f,    12.7714932994183f},
+    { -15.4967238792034f,    34.1855682977571f}};
+
 /**
  * Takes the bNs computed up to N+1, and replicates them to be of length
  * (N+1)^2 (replicating the 1st order bNs 3 times, 2nd -> 5 times etc.)
diff --git a/examples/src/beamformer/beamformer_internal.c b/examples/src/beamformer/beamformer_internal.c
diff --git a/examples/src/binauraliser_nf/binauraliser_nf.c b/examples/src/binauraliser_nf/binauraliser_nf.c
