Skip to content

Commit e7db472

Browse files
jananifernandezjananifernandez
committed
adding default parameter constants for some examples
1 parent 9ae4655 commit e7db472

File tree

13 files changed

+625
-38
lines changed

13 files changed

+625
-38
lines changed

‎examples/include/ambi_dec.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ typedef enum {
101101
/** Maximum transition value between low/high frequency decoders, in Hz */
102102
#define AMBI_DEC_TRANSITION_MAX_VALUE ( 2000.0f )
103103

104+
/** Default number of Loudspeakers */
105+
extern const int ambi_dec_defaultNumLoudspeakers;
106+
107+
/** Default Loudspeaker directions */
108+
extern const float ambi_dec_defaultLoudspeakerDirections[MAX_NUM_OUTPUTS][2];
109+
104110

105111
/* ========================================================================== */
106112
/* Main Functions */

‎examples/include/ambi_enc.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@
4343
extern "C" {
4444
#endif /* __cplusplus */
4545

46+
/* ========================================================================== */
47+
/* Presets + Constants */
48+
/* ========================================================================== */
49+
50+
/** Default number of Sources */
51+
extern const int ambi_enc_defaultNumSources;
52+
53+
/** Default Loudspeaker directions */
54+
extern const float ambi_enc_defaultSourceDirections[MAX_NUM_INPUTS][2];
55+
56+
4657
/* ========================================================================== */
4758
/* Main Functions */
4859
/* ========================================================================== */

‎examples/include/ambi_roomsim.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,34 @@
4242
extern "C" {
4343
#endif /* __cplusplus */
4444

45+
/* ========================================================================== */
46+
/* Presets + Constants */
47+
/* ========================================================================== */
48+
4549
/** Maximum supported number of receivers for the room sim example */
4650
#define ROOM_SIM_MAX_NUM_RECEIVERS ( 16 )
4751
/** Maximum supported number of sources for the room sim example */
4852
#define ROOM_SIM_MAX_NUM_SOURCES ( 16 )
4953

54+
/** Default wall absorption coefficients */
55+
extern const float ambi_roomsim_default_abs_wall[6];
56+
57+
/** Default room dimensions */
58+
extern const float ambi_roomsim_default_room_dims[3];
59+
60+
/** Default number of sources in the simulation */
61+
extern const int ambi_roomsim_defaultNumSources;
62+
63+
/** Default source positions */
64+
extern const float ambi_roomsim_defaultSourcePositions[ROOM_SIM_MAX_NUM_SOURCES][3];
65+
66+
/** Default number of receivers in the simulation */
67+
extern const int ambi_roomsim_defaultNumReceivers;
68+
69+
/** Default receiver positions */
70+
extern const float ambi_roomsim_defaultReceiverPositions[ROOM_SIM_MAX_NUM_RECEIVERS][3];
71+
72+
5073
/* ========================================================================== */
5174
/* Main Functions */
5275
/* ========================================================================== */

‎examples/include/panner.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,18 @@ extern "C" {
7070
/** Maximum supported spread angle, degrees */
7171
#define PANNER_SPREAD_MAX_VALUE ( 90.0f )
7272

73+
/** Default number of Sources */
74+
extern const int panner_defaultNumSources;
75+
76+
/** Default Loudspeaker directions */
77+
extern const float panner_defaultSourceDirections[MAX_NUM_INPUTS][2];
78+
79+
/** Default number of Loudspeakers */
80+
extern const int panner_defaultNumLoudspeakers;
81+
82+
/** Default Loudspeaker directions */
83+
extern const float panner_defaultLoudspeakerDirections[MAX_NUM_OUTPUTS][2];
84+
7385

7486
/* ========================================================================== */
7587
/* Main Functions */

‎examples/src/ambi_dec/ambi_dec.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void ambi_dec_create
5555
int i, j, ch, band;
5656

5757
/* default user parameters */
58-
loadLoudspeakerArrayPreset(LOUDSPEAKER_ARRAY_PRESET_T_DESIGN_24, pData->loudpkrs_dirs_deg, &(pData->new_nLoudpkrs), &(pData->loudpkrs_nDims));
58+
loadLoudspeakerArrayPreset(LOUDSPEAKER_ARRAY_PRESET_T_DESIGN_24, pData->loudpkrs_dirs_deg, &(pData->new_nLoudpkrs), &(pData->loudpkrs_nDims)); /* must match ambi_dec_defaultLoudspeakerDirections */
5959
pData->masterOrder = pData->new_masterOrder = 1;
6060
for (band = 0; band<HYBRID_BANDS; band++)
6161
pData->orderPerBand[band] = 1;

‎examples/src/ambi_dec/ambi_dec_internal.c‎

Lines changed: 135 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,140 @@
4343
* @license ISC
4444
*/
4545

46-
#include "ambi_dec_internal.h"
46+
#include "ambi_dec_internal.h"
47+
48+
const int ambi_dec_defaultNumLoudspeakers = 24;
49+
50+
/* First 24 loudspeakers are for a 24 point t-design, the rest are for a 128 point sphere covering */
51+
const float ambi_dec_defaultLoudspeakerDirections[MAX_NUM_OUTPUTS][2] =
52+
{ { 26.0011675216559f, 15.4641512961471f},
53+
{ -26.0011675216559f, -15.4641512961471f},
54+
{ 17.1086452559122f, -24.9937030546433f},
55+
{ -17.1086452559122f, 24.9937030546433f},
56+
{ 153.998832478344f, -15.4641512961471f},
57+
{ -153.998832478344f, 15.4641512961471f},
58+
{ 162.891354744088f, 24.9937030546433f},
59+
{ -162.891354744088f, -24.9937030546433f},
60+
{ 72.8913547440879f, 24.9937030546433f},
61+
{ 107.108645255912f, -24.9937030546433f},
62+
{ 116.001167521656f, 15.4641512961471f},
63+
{ 63.9988324783441f, -15.4641512961471f},
64+
{ -107.108645255912f, 24.9937030546433f},
65+
{ -72.8913547440879f, -24.9937030546433f},
66+
{ -63.9988324783441f, 15.4641512961471f},
67+
{ -116.001167521656f, -15.4641512961471f},
68+
{ 32.2544599366034f, 60.0253819510733f},
69+
{ -147.745540063397f, 60.0253819510733f},
70+
{ -57.7455400633966f, 60.0253819510733f},
71+
{ 122.254459936603f, 60.0253819510733f},
72+
{ -32.2544599366034f, -60.0253819510733f},
73+
{ 147.745540063397f, -60.0253819510733f},
74+
{ 57.7455400633966f, -60.0253819510733f},
75+
{ -122.254459936603f, -60.0253819510733f},
76+
{ 56.4638592172755f, 41.2645742763346f},
77+
{ 46.4626904606488f, 24.5386896277818f},
78+
{ -123.528839291756f, 41.2565889648213f},
79+
{ 32.1932295461248f, 38.8027347956192f},
80+
{ 133.534545076742f, -24.5310453346374f},
81+
{ -32.1935458377634f, -38.8041545028931f},
82+
{ -133.533477606995f, 24.5319420428588f},
83+
{ -147.797881221742f, 38.7980990097138f},
84+
{ -46.4626630742447f, -24.5400749997299f},
85+
{ 147.799544204027f, -38.7965984357137f},
86+
{ -56.4649576930965f, -41.2658215291547f},
87+
{ 123.530547454259f, -41.2555316199835f},
88+
{ 84.7385596473317f, 27.3132538556364f},
89+
{ 27.4072860474693f, 4.67593317316088f},
90+
{ -95.2612516264878f, 27.3036967398252f},
91+
{ 10.0607591758466f, 62.2287426217158f},
92+
{ 152.592710471291f, -4.67007594116539f},
93+
{ -10.0604693351594f, -62.2317767049329f},
94+
{ -152.592615409799f, 4.67188744845125f},
95+
{ -169.918387889403f, 62.2272712110016f},
96+
{ -27.4047652820400f, -4.67684895484045f},
97+
{ 169.918493477140f, -62.2246416140826f},
98+
{ -84.7390238025025f, -27.3120311727342f},
99+
{ 95.2622793653641f, -27.3027426350066f},
100+
{ 136.272846725200f, -0.726139068263599f},
101+
{ -1.05456977390436f, -46.2698051615206f},
102+
{ -43.7263256019408f, -0.737666959763443f},
103+
{ -91.0084089447853f, 43.7170295842697f},
104+
{ -178.936314291048f, 46.2682278552731f},
105+
{ 91.0100541861312f, -43.7163112498585f},
106+
{ 178.938490558618f, -46.2666218304286f},
107+
{ 88.9860902890987f, 43.7285680951606f},
108+
{ 1.05095788619312f, 46.2682407577363f},
109+
{ -88.9851906686018f, -43.7278600822776f},
110+
{ -136.273314433943f, 0.726484363994244f},
111+
{ 43.7273191822901f, 0.733967099281741f},
112+
{ 55.2321077221357f, 10.8187456245361f},
113+
{ 13.0867814081219f, 34.0654299770448f},
114+
{ -124.767898552651f, 10.8099467408727f},
115+
{ 71.4751302534919f, 53.7984109774923f},
116+
{ 166.905549455530f, -34.0625862919868f},
117+
{ -71.4765158530160f, -53.8002805142714f},
118+
{ -166.904587570338f, 34.0633858486074f},
119+
{ -108.515564585463f, 53.7864186881779f},
120+
{ -13.0869589355977f, -34.0644403811701f},
121+
{ 108.517274377512f, -53.7853093207457f},
122+
{ -55.2337689585088f, -10.8200079671294f},
123+
{ 124.767519417537f, -10.8096092876561f},
124+
{ -105.493359369733f, -68.1345228940484f},
125+
{ -111.151973933085f, -5.71277564515985f},
126+
{ 74.5244447329726f, -68.1205741555505f},
127+
{ -173.885132403874f, -21.0401043953034f},
128+
{ -68.8521018079939f, 5.70313885775370f},
129+
{ 173.885050918764f, 21.0419786777516f},
130+
{ 68.8513569996117f, -5.70297394874866f},
131+
{ 6.12041448982713f, -21.0387333986971f},
132+
{ 111.151515131908f, 5.71357243375474f},
133+
{ -6.11913621739966f, 21.0397756114589f},
134+
{ 105.487055344890f, 68.1331981897040f},
135+
{ -74.5188619841755f, 68.1214716326340f},
136+
{ 35.2822222163987f, -15.1801841162885f},
137+
{ -25.1732516880600f, 51.9826514887145f},
138+
{ -144.722913967824f, -15.1859965048827f},
139+
{ 108.386507250934f, 33.8824333892584f},
140+
{ -154.839566662519f, -51.9856067440744f},
141+
{ -108.385758587361f, -33.8826426573830f},
142+
{ 154.840828582605f, 51.9884126722963f},
143+
{ -71.6110721306039f, 33.8714084774643f},
144+
{ 25.1699762263473f, -51.9843011897216f},
145+
{ 71.6126173250777f, -33.8705490198003f},
146+
{ -35.2810594358470f, 15.1763090469469f},
147+
{ 144.722474074749f, 15.1863112389402f},
148+
{ -125.277803641269f, -28.5561977838671f},
149+
{ -146.317489805034f, -30.4888082061806f},
150+
{ 54.7220842889970f, -28.5463137051834f},
151+
{ -133.292600372594f, -45.8199818171681f},
152+
{ -33.6854220654234f, 30.4794807422719f},
153+
{ 133.295169860873f, 45.8200619710773f},
154+
{ 33.6830420572493f, -30.4828689919959f},
155+
{ 46.7098267598019f, -45.8106991831118f},
156+
{ 146.318736830907f, 30.4889588527258f},
157+
{ -46.7107531920589f, 45.8077510168776f},
158+
{ 125.278543193551f, 28.5567151663926f},
159+
{ -54.7226679373581f, 28.5424675755949f},
160+
{ -144.402199049652f, 54.7141577397485f},
161+
{ 112.382216591782f, -28.0100385212576f},
162+
{ 35.5834085793474f, 54.7193853715013f},
163+
{ -29.9155874729000f, -19.6471282266303f},
164+
{ 67.6163420587218f, 28.0211878299760f},
165+
{ 29.9151078604395f, 19.6461577548916f},
166+
{ -67.6164804090156f, -28.0221553885221f},
167+
{ 150.081679085309f, -19.6396879622134f},
168+
{ -112.381365317985f, 28.0105570315277f},
169+
{ -150.081127534239f, 19.6412999777121f},
170+
{ 144.402936805264f, -54.7127597303097f},
171+
{ -35.5837994140428f, -54.7203576209200f},
172+
{ 68.5348504928164f, -52.8527273534571f},
173+
{ -54.8218918027732f, 12.7570858971645f},
174+
{ -111.464947340552f, -52.8652964226689f},
175+
{ 164.510735700738f, 34.1892226850382f},
176+
{ -125.181243085238f, -12.7710900404128f},
177+
{ -164.510172672569f, -34.1865270720665f},
178+
{ 125.180742749445f, 12.7714932994183f},
179+
{ -15.4967238792034f, 34.1855682977571f}};
47180

48181
void ambi_dec_setCodecStatus(void* const hAmbi, CODEC_STATUS newStatus)
49182
{
@@ -302,7 +435,7 @@ void loadLoudspeakerArrayPreset
302435
/* Fill remaining slots with default coords */
303436
for(; ch<MAX_NUM_LOUDSPEAKERS; ch++)
304437
for(i=0; i<2; i++)
305-
dirs_deg[ch][i] = __default_LScoords128_deg[ch][i];
438+
dirs_deg[ch][i] = ambi_dec_defaultLoudspeakerDirections[ch][i];
306439

307440
/* specify new number of channels (for dynamically changing the number of TFT channels) */
308441
(*newNCH) = nCH;

‎examples/src/ambi_enc/ambi_enc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void ambi_enc_create
3939
pData->fs = 48000.0f;
4040

4141
/* default user parameters */
42-
loadSourceConfigPreset(SOURCE_CONFIG_PRESET_DEFAULT, pData->src_dirs_deg, &(pData->new_nSources));
42+
loadSourceConfigPreset(SOURCE_CONFIG_PRESET_DEFAULT, pData->src_dirs_deg, &(pData->new_nSources)); /* must match ambi_enc_defaultSourceDirections */
4343
pData->nSources = pData->new_nSources;
4444
for(i=0; i<MAX_NUM_INPUTS; i++){
4545
pData->recalc_SH_FLAG[i] = 1;

‎examples/src/ambi_enc/ambi_enc_internal.c‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,139 @@
2626
#include "ambi_enc.h"
2727
#include "ambi_enc_internal.h"
2828

29+
const int ambi_enc_defaultNumSources = 1;
30+
31+
/* First 1 source(s) are for mono [0 0], the rest are for a 128 point sphere covering */
32+
const float ambi_enc_defaultSourceDirections[MAX_NUM_INPUTS][2] =
33+
{ { 0.0f, 0.0f},
34+
{ -120.415474946769f, 69.7642225220975f},
35+
{ 169.426697678052f, -17.3466306179260f},
36+
{ 107.629281568279f, -10.0793856720614f},
37+
{ -59.5674172539630f, -69.7763953095265f},
38+
{ -107.629493132161f, 10.0801907586439f},
39+
{ 59.5651193014662f, 69.7750019669784f},
40+
{ -72.3715136529922f, -10.0909592824967f},
41+
{ 120.418832045969f, -69.7630732527928f},
42+
{ 72.3705387467529f, 10.0908849630425f},
43+
{ 10.5699823270029f, 17.3489915451677f},
44+
{ -169.426851150349f, 17.3476277272366f},
45+
{ -30.7728814706980f, 68.2546206344998f},
46+
{ 101.529181734204f, 18.5653877408229f},
47+
{ 149.250234431564f, 68.2619792676765f},
48+
{ 18.9183978612362f, -10.9197242075287f},
49+
{ 78.4729799557400f, -18.5558892226653f},
50+
{ -18.9161109968480f, 10.9195275229078f},
51+
{ -78.4723066816396f, 18.5565169424192f},
52+
{ -161.085243560336f, -10.9220975953767f},
53+
{ -101.530063994217f, -18.5648176173994f},
54+
{ 161.085855454581f, 10.9237834974412f},
55+
{ 30.7790837424989f, -68.2562996173874f},
56+
{ -149.255648697558f, -68.2594892022576f},
57+
{ 56.4638592172755f, 41.2645742763346f},
58+
{ 46.4626904606488f, 24.5386896277818f},
59+
{ -123.528839291756f, 41.2565889648213f},
60+
{ 32.1932295461248f, 38.8027347956192f},
61+
{ 133.534545076742f, -24.5310453346374f},
62+
{ -32.1935458377634f, -38.8041545028931f},
63+
{ -133.533477606995f, 24.5319420428588f},
64+
{ -147.797881221742f, 38.7980990097138f},
65+
{ -46.4626630742447f, -24.5400749997299f},
66+
{ 147.799544204027f, -38.7965984357137f},
67+
{ -56.4649576930965f, -41.2658215291547f},
68+
{ 123.530547454259f, -41.2555316199835f},
69+
{ 84.7385596473317f, 27.3132538556364f},
70+
{ 27.4072860474693f, 4.67593317316088f},
71+
{ -95.2612516264878f, 27.3036967398252f},
72+
{ 10.0607591758466f, 62.2287426217158f},
73+
{ 152.592710471291f, -4.67007594116539f},
74+
{ -10.0604693351594f, -62.2317767049329f},
75+
{ -152.592615409799f, 4.67188744845125f},
76+
{ -169.918387889403f, 62.2272712110016f},
77+
{ -27.4047652820400f, -4.67684895484045f},
78+
{ 169.918493477140f, -62.2246416140826f},
79+
{ -84.7390238025025f, -27.3120311727342f},
80+
{ 95.2622793653641f, -27.3027426350066f},
81+
{ 136.272846725200f, -0.726139068263599f},
82+
{ -1.05456977390436f, -46.2698051615206f},
83+
{ -43.7263256019408f, -0.737666959763443f},
84+
{ -91.0084089447853f, 43.7170295842697f},
85+
{ -178.936314291048f, 46.2682278552731f},
86+
{ 91.0100541861312f, -43.7163112498585f},
87+
{ 178.938490558618f, -46.2666218304286f},
88+
{ 88.9860902890987f, 43.7285680951606f},
89+
{ 1.05095788619312f, 46.2682407577363f},
90+
{ -88.9851906686018f, -43.7278600822776f},
91+
{ -136.273314433943f, 0.726484363994244f},
92+
{ 43.7273191822901f, 0.733967099281741f},
93+
{ 55.2321077221357f, 10.8187456245361f},
94+
{ 13.0867814081219f, 34.0654299770448f},
95+
{ -124.767898552651f, 10.8099467408727f},
96+
{ 71.4751302534919f, 53.7984109774923f},
97+
{ 166.905549455530f, -34.0625862919868f},
98+
{ -71.4765158530160f, -53.8002805142714f},
99+
{ -166.904587570338f, 34.0633858486074f},
100+
{ -108.515564585463f, 53.7864186881779f},
101+
{ -13.0869589355977f, -34.0644403811701f},
102+
{ 108.517274377512f, -53.7853093207457f},
103+
{ -55.2337689585088f, -10.8200079671294f},
104+
{ 124.767519417537f, -10.8096092876561f},
105+
{ -105.493359369733f, -68.1345228940484f},
106+
{ -111.151973933085f, -5.71277564515985f},
107+
{ 74.5244447329726f, -68.1205741555505f},
108+
{ -173.885132403874f, -21.0401043953034f},
109+
{ -68.8521018079939f, 5.70313885775370f},
110+
{ 173.885050918764f, 21.0419786777516f},
111+
{ 68.8513569996117f, -5.70297394874866f},
112+
{ 6.12041448982713f, -21.0387333986971f},
113+
{ 111.151515131908f, 5.71357243375474f},
114+
{ -6.11913621739966f, 21.0397756114589f},
115+
{ 105.487055344890f, 68.1331981897040f},
116+
{ -74.5188619841755f, 68.1214716326340f},
117+
{ 35.2822222163987f, -15.1801841162885f},
118+
{ -25.1732516880600f, 51.9826514887145f},
119+
{ -144.722913967824f, -15.1859965048827f},
120+
{ 108.386507250934f, 33.8824333892584f},
121+
{ -154.839566662519f, -51.9856067440744f},
122+
{ -108.385758587361f, -33.8826426573830f},
123+
{ 154.840828582605f, 51.9884126722963f},
124+
{ -71.6110721306039f, 33.8714084774643f},
125+
{ 25.1699762263473f, -51.9843011897216f},
126+
{ 71.6126173250777f, -33.8705490198003f},
127+
{ -35.2810594358470f, 15.1763090469469f},
128+
{ 144.722474074749f, 15.1863112389402f},
129+
{ -125.277803641269f, -28.5561977838671f},
130+
{ -146.317489805034f, -30.4888082061806f},
131+
{ 54.7220842889970f, -28.5463137051834f},
132+
{ -133.292600372594f, -45.8199818171681f},
133+
{ -33.6854220654234f, 30.4794807422719f},
134+
{ 133.295169860873f, 45.8200619710773f},
135+
{ 33.6830420572493f, -30.4828689919959f},
136+
{ 46.7098267598019f, -45.8106991831118f},
137+
{ 146.318736830907f, 30.4889588527258f},
138+
{ -46.7107531920589f, 45.8077510168776f},
139+
{ 125.278543193551f, 28.5567151663926f},
140+
{ -54.7226679373581f, 28.5424675755949f},
141+
{ -144.402199049652f, 54.7141577397485f},
142+
{ 112.382216591782f, -28.0100385212576f},
143+
{ 35.5834085793474f, 54.7193853715013f},
144+
{ -29.9155874729000f, -19.6471282266303f},
145+
{ 67.6163420587218f, 28.0211878299760f},
146+
{ 29.9151078604395f, 19.6461577548916f},
147+
{ -67.6164804090156f, -28.0221553885221f},
148+
{ 150.081679085309f, -19.6396879622134f},
149+
{ -112.381365317985f, 28.0105570315277f},
150+
{ -150.081127534239f, 19.6412999777121f},
151+
{ 144.402936805264f, -54.7127597303097f},
152+
{ -35.5837994140428f, -54.7203576209200f},
153+
{ 68.5348504928164f, -52.8527273534571f},
154+
{ -54.8218918027732f, 12.7570858971645f},
155+
{ -111.464947340552f, -52.8652964226689f},
156+
{ 164.510735700738f, 34.1892226850382f},
157+
{ -125.181243085238f, -12.7710900404128f},
158+
{ -164.510172672569f, -34.1865270720665f},
159+
{ 125.180742749445f, 12.7714932994183f},
160+
{ -15.4967238792034f, 34.1855682977571f}};
161+
29162
void loadSourceConfigPreset
30163
(
31164
SOURCE_CONFIG_PRESETS preset,

0 commit comments

Comments
 (0)