Commit fa80b6ac authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix errors in MAXN and FuMa scaling tables

parent 1f9fadfc

lib_util/ambi_convert.c

+15 −15
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ 
#define INV_SQRT_7_ 0.3779644f



#define TWO_OVER_SQRT_3_   1.1547005f

#define THREE_OVER_SQRT_5_ 1.3416408f

#define SQRT_8_OVER_5_     1.2649110f

#define SQRT_3_OVER_5_   0.7745966f

#define SQRT_45_OVER_32_   1.1858541f



#define INV_TWO_OVER_SQRT_3_   0.8660254f

#define INV_THREE_OVER_SQRT_5_ 0.7453560f

#define INV_SQRT_8_OVER_5_     0.7905694f

#define INV_SQRT_3_OVER_5_   1.2909944f

#define INV_SQRT_45_OVER_32_   0.8432740f



#define AMBI_MAX_CHANNELS 16
@@ -77,26 +77,26 @@ static const float N3D_SCALING_FACTOR = 1.0f; 


static const float SN3D_MAXN[AMBI_MAX_CHANNELS] = { 1.0f,

                                                    1.0f, 1.0f, 1.0f,

                                                    TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_, 1, TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_,

                                                    SQRT_8_OVER_5_, SQRT_3_OVER_5_, SQRT_45_OVER_32_, 1, SQRT_45_OVER_32_, SQRT_3_OVER_5_, SQRT_8_OVER_5_ };

                                                    TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_, 1.0f, TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_,

                                                    SQRT_8_OVER_5_, THREE_OVER_SQRT_5_, SQRT_45_OVER_32_, 1.0f, SQRT_45_OVER_32_, THREE_OVER_SQRT_5_, SQRT_8_OVER_5_ };



static const float MAXN_SN3D[AMBI_MAX_CHANNELS] = { 1.0f,

                                                    1.0f, 1.0f, 1.0f,

                                                    INV_TWO_OVER_SQRT_3_, INV_TWO_OVER_SQRT_3_, 1.0f, INV_TWO_OVER_SQRT_3_, INV_TWO_OVER_SQRT_3_,

                                                    INV_SQRT_8_OVER_5_, INV_SQRT_3_OVER_5_, INV_SQRT_45_OVER_32_, 1.0f, INV_SQRT_45_OVER_32_, INV_SQRT_3_OVER_5_, INV_SQRT_8_OVER_5_ };

                                                    INV_SQRT_8_OVER_5_, INV_THREE_OVER_SQRT_5_, INV_SQRT_45_OVER_32_, 1.0f, INV_SQRT_45_OVER_32_, INV_THREE_OVER_SQRT_5_, INV_SQRT_8_OVER_5_ };



static const float MAXN_SCALING_FACTOR = SQRT_3_OVER_5_;

static const float MAXN_SCALING_FACTOR = 1.0f;





static const float SN3D_FM[AMBI_MAX_CHANNELS] = { INV_SQRT_2,

                                                  1.0f, 1.0f, 1.0f,

                                                  TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_, 1, TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_,

                                                  SQRT_8_OVER_5_, SQRT_3_OVER_5_, SQRT_45_OVER_32_, 1, SQRT_45_OVER_32_, SQRT_3_OVER_5_, SQRT_8_OVER_5_ };

                                                  TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_, 1.0f, TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_,

                                                  SQRT_8_OVER_5_, THREE_OVER_SQRT_5_, SQRT_45_OVER_32_, 1.0f, SQRT_45_OVER_32_, THREE_OVER_SQRT_5_, SQRT_8_OVER_5_ };



static const float FM_SN3D[AMBI_MAX_CHANNELS] = { SQRT_2_,

                                                  1.0f, 1.0f, 1.0f,

                                                  INV_TWO_OVER_SQRT_3_, INV_TWO_OVER_SQRT_3_, 1.0f, INV_TWO_OVER_SQRT_3_, INV_TWO_OVER_SQRT_3_,

                                                  INV_SQRT_8_OVER_5_, INV_SQRT_3_OVER_5_, INV_SQRT_45_OVER_32_, 1.0f, INV_SQRT_45_OVER_32_, INV_SQRT_3_OVER_5_, INV_SQRT_8_OVER_5_ };

                                                  INV_SQRT_8_OVER_5_, INV_THREE_OVER_SQRT_5_, INV_SQRT_45_OVER_32_, 1.0f, INV_SQRT_45_OVER_32_, INV_THREE_OVER_SQRT_5_, INV_SQRT_8_OVER_5_ };



static const float FM_SCALING_FACTOR = INV_SQRT_2;