Commit e6348466 authored by kinuthia's avatar kinuthia
Browse files

Merge branch 'main' into ci/add-long-term-logs

parents bf63482d d9628e4d

lib_com/cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ 
#define ONE_IN_Q29                      536870912

#define ONE_IN_Q30                      1073741824

#define ONE_IN_Q31                      0x7fffffff

#define MINUS_ONE_IN_Q31                0x80000000

#define MINUS_ONE_IN_Q31                (-2147483647 - 1)

#define TWO_IN_Q29                      1073741824

#define FOUR_IN_Q28                     1073741824

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -79,7 +79,10 @@ 




/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

#define OPT_MCT_ENC_V2_BE

#define OPT_MCH_DEC_V1_NBE

#define OPT_MASA_DEC_V1_NBE

#define OPT_MASA_DEC_V2_NBE

#define OPT_MCT_ENC_48KB_NBE

#define OPT_MCH_DEC_V1_BE

#define OPT_MCT_ENC_V2_NBE
@@ -123,4 +126,5 @@ 
#define FIX_ISSUE_1795_Q3_OVERFLOW              /* FhG: Q3 overflow in function WB_BWE_gain_pred_fx (EVS legacy code) BE, MR1855 */

#define NONBE_FIX_1748_SPAR_DIV_OPT                      /*Dlb: issue 1748: SPAR common div optimizations*/



#define FIX_ISSUE_1801_NOISE_FLOOR_REDUCTION    /* FhG: Fixed getScalefactor usage */

#endif

lib_com/residu_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void Residu3_fx( 
    move16();

#endif

    q = add( norm_s( a[0] ), 1 );

    IF( shift != 0 )

    if ( shift != 0 )

    {

        q = add( q, shift );

    }

lib_com/tools.c

+8 −0
Original line number Diff line number Diff line
@@ -688,7 +688,11 @@ Word32 dotp_fixed_o( 
    move16();

    test();

    test();

#ifdef OPT_MCT_ENC_V2_BE

    FOR( ; ( suma > MAX_32 ) || ( suma < MIN_32 ) || ( *res_q > 31 ); )

#else

    WHILE( GT_64( suma, MAX_32 ) || LT_64( suma, MIN_32 ) || GT_16( *res_q, 31 ) )

#endif

    {

        suma = W_shr( suma, 1 );

        *res_q = sub( *res_q, 1 );
@@ -718,7 +722,11 @@ Word32 dotp_fixed_32( 
    move16();

    test();

    test();

#ifdef OPT_MCT_ENC_V2_BE

    FOR( ; ( suma > MAX_32 ) || ( suma < MIN_32 ) || ( *res_q > 31 ); )

#else

    WHILE( GT_64( suma, MAX_32 ) || LT_64( suma, MIN_32 ) || GT_16( *res_q, 31 ) )

#endif

    {

        suma = W_shr( suma, 1 );

        *res_q = sub( *res_q, 1 );

lib_dec/ivas_cpe_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ ivas_error ivas_cpe_dec_fx( 


        IF( NE_16( shift, 31 ) )

        {

            shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q15 ); /* Q15 for guard bits */

            shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q16 ); /* Q16 for guard bits */



            IF( GT_16( shift, hCPE->hStereoDft->q_dft ) )

            {