Commit 689bf65b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2284_ADD_ASSERT_LOG

parent 2de182ee

lib_com/log2.c

+0 −11
Original line number Diff line number Diff line
@@ -72,9 +72,7 @@ Word16 Log2_norm_lc( /* (o) : Fractional part of Log2. (range: 0<=val 


    i = mac_r( L_x, -32 * 2 - 1, 16384 ); /* Extract b25-b31 minus 32 */



#ifdef FIX_2284_ADD_ASSERT_LOG

    assert( ( i >= 0 ) && ( i < (Word16) ( sizeof( L_table_Log2_norm_lc ) / sizeof( L_table_Log2_norm_lc[0] ) ) ) && ( i < (Word16) ( sizeof( table_diff_Log2_norm_lc ) / sizeof( table_diff_Log2_norm_lc[0] ) ) ) );

#endif



    y = mac_r( L_table_Log2_norm_lc[i], table_diff_Log2_norm_lc[i], a ); /* table[i] << 16 - diff*a*2 */
@@ -84,9 +82,7 @@ Word16 Log2_norm_lc( /* (o) : Fractional part of Log2. (range: 0<=val 
Word32 log10_fx( Word32 Linput ) /*o : Q23, i: 2Q13*/

{

    Word16 n1, frac, p1, p2, q1;

#ifdef FIX_2284_ADD_ASSERT_LOG

    Word16 idx;

#endif

    Word32 Ltemp1, Ltemp2;

    Word32 L_tmp;
@@ -101,7 +97,6 @@ Word32 log10_fx( Word32 Linput ) /*o : Q23, i: 2Q13*/ 
    Ltemp2 = L_mult( extract_h( Ltemp1 ), 0x40 );

    frac = extract_l( Ltemp2 );



#ifdef FIX_2284_ADD_ASSERT_LOG

    idx = sub( extract_h( Ltemp2 ), 0x20 );

    assert( idx >= 0 && idx < (Word16) ( sizeof( log2_tab ) / sizeof( log2_tab[0] ) ) );

    p1 = log2_tab[idx];
@@ -112,12 +107,6 @@ Word32 log10_fx( Word32 Linput ) /*o : Q23, i: 2Q13*/ 
    p2 = log2_tab[idx];

    move16();



#else

    p1 = log2_tab[sub( extract_h( Ltemp2 ), 0x20 )];

    move16();

    p2 = log2_tab[sub( extract_h( Ltemp2 ), 0x1F )];

    move16();

#endif

    Ltemp2 = L_mult( n1, 0x200 );

    n1 = extract_l( Ltemp2 );

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 
#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_2284_ADD_ASSERT_LOG                         /* FhG: add asserts to Log2_norm_lc() and log10_fx() */

#define FIX_2286_GCC_WARNING_Idx2Freq_Tbl               /* FhG: Fix compiler warning for OOB access of Idx2Freq_Tbl[] */

#define FIX_CLANG18_MSAN_IN_DEC_INIT_BY_MOVING_COMMON_INITS_TOGETHER /* FhG: fix CLANG18 MSAN error in decoder init */

#define FIX_1481_CLANG18_MSAN_INIT_LAST_ELEM_BRATE      /* FhG: initialize last_element_brate to avoid CLANG18 MSAN complaint */