Commit ff3cc1dd authored by vaclav's avatar vaclav
Browse files

move local constants from ivas_cnst.h to the appropriate file

parent 338cc091

lib_com/ivas_cnst.h

+3 −10
Original line number Diff line number Diff line
@@ -189,10 +189,12 @@ typedef enum 


#define IVAS_MAX_SBA_ORDER                      3                           /* Maximum supported Ambisonics order */



#define IVAS_NUM_SUPPORTED_FS                   3                           /* number of supported sampling-rates in IVAS */



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

 * IVAS Bitrates

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



#define IVAS_SID_5k2                            5200 /* SID frame bitrate */

#define IVAS_13k2                               13200

#define IVAS_16k4                               16400
@@ -1427,7 +1429,7 @@ typedef enum 


typedef enum

{

    OTR_TRACKING_NONE = IVAS_ORIENT_TRK_REF-1, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */

    OTR_TRACKING_NONE = IVAS_ORIENT_TRK_REF-1, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */ // VE: not really used in IVAS (only in unit-test)

    OTR_TRACKING_REF_ORIENT = IVAS_ORIENT_TRK_REF, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */

    OTR_TRACKING_AVG_ORIENT = IVAS_ORIENT_TRK_AVG  /* track orientation relative to average orientation */
@@ -1454,13 +1456,6 @@ typedef enum 
 * FB mixer constants

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



#define IVAS_ONE_BY_960                         0.001041666666666666f

#define IVAS_ONE_BY_640                         0.0015625f

#define IVAS_ONE_BY_320                         0.003125f

#define IVAS_ONE_BY_240                         0.004166666666666667f

#define IVAS_ONE_BY_160                         0.00625f

#define IVAS_ONE_BY_80                          0.0125f



#define IVAS_960_PT_LEN                         960

#define IVAS_640_PT_LEN                         640

#define IVAS_480_PT_LEN                         480
@@ -1470,8 +1465,6 @@ typedef enum 
#define IVAS_80_PT_LEN                          80

#define IVAS_40_PT_LEN                          40



#define IVAS_NUM_SUPPORTED_FS                   3



/* FB windows ovlp */

#define IVAS_FB_4MS_48K_SAMP                    192

#define IVAS_FB_1MS_48K_SAMP                    48

lib_com/ivas_mdft_imdft.c

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,18 @@ 
#include "wmops.h"





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

 * Local constants

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



#define IVAS_ONE_BY_960 0.001041666666666666f

#define IVAS_ONE_BY_640 0.0015625f

#define IVAS_ONE_BY_320 0.003125f

#define IVAS_ONE_BY_240 0.004166666666666667f

#define IVAS_ONE_BY_160 0.00625f

#define IVAS_ONE_BY_80  0.0125f





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

 * Function ivas_get_mdft_twid_factors()

 *