Commit b6d523f3 authored by multrus's avatar multrus
Browse files

merge from main

parents 69ae4bd8 0181b006

lib_com/basop_util.c

+0 −4
Original line number Diff line number Diff line
@@ -1408,11 +1408,7 @@ Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, Word32 y, Word16 *s ) 
        *s = 0;

        return ( (Word32) 0 );

    }

#ifdef FIX_USAN_BASOP_UTIL_DIVIDE3232

    IF( EQ_32( y, (Word32) 0x80000000 ) )

#else

    IF( EQ_32( y, 0x80000000 ) )

#endif

    {

        /* Division by -1.0: same as negation of numerator */

        /* Return normalized negated numerator */

lib_com/cldfb_fx.c

+0 −455

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -788,9 +788,7 @@ enum 
#define L_HP20_MEM                          4                      /* HP20 filter memory length */



#define CLDFB_NO_CHANNELS_MAX               60                     /* CLDFB resampling - max number of CLDFB channels, == IVAS_CLDFB_NO_CHANNELS_MAX */

#ifdef FIX_867_CLDFB_NRG_SCALE

#define CLDFB_NO_CHANNELS_HALF              30                     /* CLDFB resampling - max number of CLDFB channels, == IVAS_CLDFB_NO_CHANNELS_MAX */

#endif

#define CLDFB_NO_CHANNELS_MAX_FX            30720                  /*Q9*/ 

#define CLDFB_NO_COL_MAX                    16                     /* CLDFB resampling - max number of CLDFB col., == IVAS_CLDFB_NO_COL_MAX */

#define CLDFB_NO_COL_MAX_LOG2               4                      /* To be used for shift operation instead of division */

lib_com/deemph_fx.c

+1 −5
Original line number Diff line number Diff line
@@ -197,11 +197,7 @@ void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, W 
    {

        FOR( i = 0; i < L; i++ )

        {

#ifdef ISSUE_1772_replace_shr_o

            L_tmp = L_msu_o( Mpy_32_16_1( L_tmp, mu ), shr_sat( x[i], shift ), -32768 /*1.0f in Q15*/, &Overflow ); /*Qx-shift+16*/

#else

            L_tmp = L_msu_o( Mpy_32_16_1( L_tmp, mu ), shr_o( x[i], shift, &Overflow ), -32768 /*1.0f in Q15*/, &Overflow ); /*Qx-shift+16*/

#endif

            x[i] = round_fx_o( L_tmp, &Overflow );                                                                  /*Qx-shift*/

            move16();

        }

lib_com/interpol_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -70,14 +70,8 @@ Word32 Interpol_lc_fx( /* o : interpolated value 
            c2 += up_samp; /* move16() not needed, since the coefficient can be rearrange in bit exact way */

            c1 += up_samp;

        }

#ifdef OPT_SBA_ENC_V2_BE

        L_sum = W_shl_sat_l( L_sum64, 1 ); /*Q15*/

    }

#else

        L_sum = W_sat_l( L_sum64 ); /*Q14*/

    }

    L_sum = L_shl_sat( L_sum, 1 ); /*Q15*/

#endif

    return L_sum;

}