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

fix conversion direction in the tables

parent dcfad219

lib_util/ambi_convert.c

+6 −6
Original line number Diff line number Diff line
@@ -64,34 +64,34 @@ 
   normalization conversion tables

   -------------------------------- */



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

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

                                                   SQRT_3_, SQRT_3_, SQRT_3_,

                                                   SQRT_5_, SQRT_5_, SQRT_5_, SQRT_5_, SQRT_5_,

                                                   SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_ };



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

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

                                                   INV_SQRT_3_, INV_SQRT_3_, INV_SQRT_3_,

                                                   INV_SQRT_5_, INV_SQRT_5_, INV_SQRT_5_, INV_SQRT_5_, INV_SQRT_5_,

                                                   INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_ };





static const float MAXN_SN3D[AMBI_MAX_CHANNELS] = { 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_ };



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

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_ };





static const float SN3D_FM[AMBI_MAX_CHANNELS] = { SQRT_2_,

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_ };



static const float FM_SN3D[AMBI_MAX_CHANNELS] = { INV_SQRT_2,

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_ };