Commit 09a8c87d authored by malenov's avatar malenov
Browse files

uncomment #ifdef IVAS_FLOAT_FIXED ... #endif

parent d00fe7f4

lib_com/wtda.c

+2 −2
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ 
#include "rom_com.h"

#include <assert.h>

#include "wmc_auto.h"

//#ifdef IVAS_FLOAT_FIXED

#ifdef IVAS_FLOAT_FIXED

#include "prot_fx.h"

//#endif // IVAS_FLOAT_FIXED

#endif 



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

 *  mvr2r_inv()

lib_dec/bass_psfilter.c

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ 
#include "rom_com.h"

#include <assert.h>

#include "wmc_auto.h"

//#ifdef IVAS_FLOAT_FIXED

#ifdef IVAS_FLOAT_FIXED

#include "ivas_prot_fx.h"

//#endif

#endif



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

 * Local constants

lib_dec/dec_higher_acelp.c

+2 −2
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ 
#include "prot.h"

#include "rom_com.h"

#include "wmc_auto.h"

//#ifdef IVAS_FLOAT_FIXED

#ifdef IVAS_FLOAT_FIXED

#include "prot_fx.h"

//#endif

#endif



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

 * transf_cdbk_dec()

lib_dec/ivas_ism_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -37,10 +37,11 @@ 
#include "ivas_prot_fx.h"

#include "ivas_prot_rend.h"

#include "wmc_auto.h"

//#ifdef IVAS_FLOAT_FIXED

#ifdef IVAS_FLOAT_FIXED

#include "ivas_prot_fx.h"

#include "prot_fx.h"

//#endif

#endif



#define IVAS_FLOAT_FIXED_TO_BE_REMOVED



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

lib_dec/ivas_jbm_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -43,14 +43,14 @@ 
#include <math.h>

#include "wmc_auto.h"

#include "ivas_prot_fx.h"

#ifdef DUMPS_ENABLED

#ifdef DEBUGGING

#include "debug.h"

#endif // DUMPS_ENABLED

#endif 

#include "prot_fx.h"



#define float_to_fixed( n, factor ) ( round( n * ( 1 << factor ) ) )

#define fixed_to_float( n, factor ) ( (float) n / ( 1 << factor ) )



#include "debug.h"

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

 * Local function prototypes

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