Commit 123f3f51 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

remove IVAS-specific dependencies from ambi_convert.h and ambi_convert.c

parent 0eb68c06

lib_util/ambi_convert.c

+3 −4
Original line number Diff line number Diff line
@@ -29,13 +29,12 @@ 
   the United Nations Convention on Contracts on the International Sales of Goods.



*******************************************************************************************************/

#include "options.h"



#include <stdint.h>

#include <assert.h>

#include "ivas_cnst.h"

#include "ambi_convert.h"



#define L_FRAME48k 960



#define SQRT_2_ 1.4142135f /* sqrtf(2.0f) */

#define SQRT_3_ 1.7320508f /* sqrtf(3.0f) */

#define SQRT_5_ 2.2360679f /* sqrtf(5.0f) */
@@ -84,7 +83,7 @@ static const float MAXN_SN3D[AMBI_MAX_CHANNELS] = { 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_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 SN3D_FM[AMBI_MAX_CHANNELS] = { INV_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.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_ };

lib_util/ambi_convert.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#ifndef AMBI_CONVERT_H

#define AMBI_CONVERT_H



#include "options.h"

#include <stdint.h>



typedef enum