Commit ae491916 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC

parent 06e649d7

lib_com/log2.c

+0 −5
Original line number Diff line number Diff line
@@ -57,15 +57,10 @@ Word16 Log2_norm_lc( /* (o) : Fractional part of Log2. (range: 0<=val 
{

    Word16 i, a;

    Word16 y;

#ifndef FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC

    if ( L_x <= 0 )

        L_x = L_deposit_h( 0x4000 );

#else



    if ( L_x > 0 )                   /* There are many cases in the code where L_x == 0 */

        assert( L_x >= 0x40000000 ); /* If assert fail, means input is not normalized as it should be */

    L_x = L_max( L_x, 0x40000000 );

#endif

    L_x = L_shr( L_x, 9 );

    a = extract_l( L_x ); /* Extract b10-b24 of fraction */

    a = lshr( a, 1 );

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC   /* VA: Fix issue 2264 by adding a proper safeguard in log2 and by adding a missing normalization in swb_pre_proc_ivas_fx()*/

#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */

#define FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE  /* VA: Precision improvement without increasing complexity, or complexity reduction that might be not BE on the LSB */

#define FIX_2252_LP_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */

lib_enc/swb_pre_proc_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -1125,9 +1125,7 @@ void swb_pre_proc_ivas_fx( 
                CldfbHB_fx = EPSILON_FX;

                move32();

            }

#ifdef FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC

            exp = norm_l( CldfbHB_fx );

#endif

            CldfbHB_fx = L_shl( CldfbHB_fx, exp );   /* CldfbHB_ener = CldfbHB_fl*2^(exp) */

            Cldfbtemp1 = Log2_norm_lc( CldfbHB_fx ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */

            Cldfbtemp1 = sub( shr( Cldfbtemp1, 6 ), shl( add( sub( Q31 - Q30, CldfbHB_fx_e ), exp ), 9 ) );