Commit 02a6714e authored by Gregory Pallone's avatar Gregory Pallone
Browse files

harmonize MINUS_ONE_IN_Q31

parent ad138f6b

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -1932,6 +1932,7 @@ typedef enum 
#define ONE_IN_Q31                              0x7fffffff

#define ONE_IN_Q45                              (Word64)0x200000000000

#define ONE_IN_Q62                              (Word64)0x4000000000000000

#define MINUS_ONE_IN_Q31                        ( -2147483647 - 1 ) /* same as (Word32)0x80000000 */



#define MAX_WORD16                              32767
@@ -1963,7 +1964,6 @@ typedef enum 
#define ONE_BY_THREE_Q15                        10923    /* 1/3.f in Q15  */

#define ONE_BY_TEN_Q15                          3277     /* 1/10.f in Q15 */

#define THREE_Q21                               6291456

#define _MINUS_ONE_IN_Q31                       0x80000000



#endif

/* clang-format on */

lib_dec/ivas_svd_dec_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#define SVD_ZERO_FLUSH_THRESHOLD_FX ( 0 )

#define CONVERGENCE_FACTOR_FX       214748 /* factor for SVD convergence (as per latest float code: 1.0e-04f) */



#define MINUS_ONE_IN_Q31 ( -2147483647 - 1 )



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

 * Local function prototypes

lib_rend/lib_rend_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2660,7 +2660,7 @@ static ivas_error updateMcPanGainsForMcOut( 
                inputMc->panGains_fx[0][0] = ONE_IN_Q31;

                inputMc->panGains_fx[0][1] = 0;

            }

            ELSE IF( EQ_32( inputMc->nonDiegeticPanGain_fx, _MINUS_ONE_IN_Q31 ) )

            ELSE IF( EQ_32( inputMc->nonDiegeticPanGain_fx, MINUS_ONE_IN_Q31 ) )

            {

                inputMc->panGains_fx[0][0] = 0;

                inputMc->panGains_fx[0][1] = ONE_IN_Q31;
@@ -7024,7 +7024,7 @@ static ivas_error renderIsmToMc( 
                currentPanGains_fx[0] = ONE_IN_Q31;

                currentPanGains_fx[1] = 0;

            }

            ELSE IF( EQ_32( ismInput->nonDiegeticPanGain_fx, _MINUS_ONE_IN_Q31 ) )

            ELSE IF( EQ_32( ismInput->nonDiegeticPanGain_fx, MINUS_ONE_IN_Q31 ) )



            {

                currentPanGains_fx[0] = 0;