Commit aa60804e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP

parent 3eec71b9

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#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_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP       /* FhG: remove dead (always-overwritten) gsMapping clamp in ic_bwe_enc_gsMapping_fx; float ref has no clamp */

#define FIX_BASOP_2626_RC_UNI_DEC_READ_BITS_HANG        /* FhG: BASOP #2626: rc_uni_dec_read_bits: replace loop counter tmp with UWord64; with UWord32 the division-substitute loop (tmp <= low) never terminates after the bit-error sentinel sets rc_low=0xFFFFFFFF -> decoder hang on corrupted bitstreams */



/* #################### End BE switches ################################## */

lib_enc/ivas_stereo_icbwe_enc_fx.c

+0 −24
Original line number Diff line number Diff line
@@ -373,18 +373,6 @@ static Word16 ic_bwe_enc_gsMapping_fx( 
    /* quantize the IC-BWE GS mapping*/

    IF( EQ_16( element_mode, IVAS_CPE_TD ) )

    {

#ifndef FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP

        IF( LT_32( temp2_fx32, -( 2 << 25 ) ) )

        {

            temp2_fx = -( 2 << 12 ); // Q12

            move16();

        }

        ELSE IF( GT_32( temp2_fx32, 1 << 25 ) )

        {

            temp2_fx = 1 << 12; // Q12

            move16();

        }

#endif



        temp2_fx = extract_h( L_shl_sat( temp2_fx32, Q3 ) ); // Q12

        gsMapping_fx16 = 0;
@@ -393,18 +381,6 @@ static Word16 ic_bwe_enc_gsMapping_fx( 
    }

    ELSE

    {

#ifndef FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP

        IF( LT_32( temp2_fx32, -( 5 << 25 ) ) )

        {

            temp2_fx = -( 5 << 12 ); // Q12

            move16();

        }

        ELSE IF( GT_32( temp2_fx32, 1 << 25 ) )

        {

            temp2_fx = 1 << 12; // Q12

            move16();

        }

#endif



        temp2_fx = extract_h( L_shl_sat( temp2_fx32, Q3 ) ); // Q12

        gsMapping_fx16 = 0;