Commit 74ac8685 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISSUE_2616_BOUNDARY_CONDITION

parent 03b62ac8

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_ISSUE_2616_BOUNDARY_CONDITION               /* FhG: basop issue 2616: Inconsistent boundary conditions in function stereo_dft_dequantize_res_gains*/

#define FIX_ISSUE_2613_WRONG_COMP_MACRO                 /* FhG: basop issue 2613: Inconsistent comparison macros in function tdm_SCh_LSF_intra_pred_fx*/

#define FIX_ISSUE_2611_WRONG_COMMENT                    /* FhG: basop issue 2611: Wrong Q value comment in fucntion stereo_dft_sg_recovery_fx()*/

#define FIX_BASOP_2550_TCX_ENC_MEM_UPDATE               /* FhG: fix condition in tcx_encoder_memory_update_*_fx(), bring inline with float */

lib_dec/ivas_stereo_dft_dec_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -445,11 +445,7 @@ static void stereo_dft_dequantize_res_gains_fx( 
        move16();

        ind2[i] = check_bounds_s_fx( ind2[i], 0, 7 ); /* Q0 */

        move16();

#ifndef FIX_ISSUE_2616_BOUNDARY_CONDITION

        IF( LE_16( ind1[i], 15 ) )

#else

        IF( LT_16( ind1[i], 15 ) )

#endif // !FIX_ISSUE_2616_BOUNDARY_CONDITION

        {

            tmp = sub( 15, ind1[i] );

        }
@@ -460,11 +456,7 @@ static void stereo_dft_dequantize_res_gains_fx( 
        // index = add( shl( LE_16( ind1[i], 15 ) ? sub( 15, ind1[i] ) : sub( ind1[i], 15 ), 3 ), ind2[i] );

        index = add( shl( tmp, 3 ), ind2[i] );

        // gout[i] = LE_16( ind1[i], 15 ) ? L_negate( dft_res_gains_q_fx[index][0] ) : dft_res_gains_q_fx[index][0];

#ifndef FIX_ISSUE_2616_BOUNDARY_CONDITION

        IF( LE_16( ind1[i], 15 ) )

#else

        IF( LT_16( ind1[i], 15 ) )

#endif // !FIX_ISSUE_2616_BOUNDARY_CONDITION

        {

            gout[i] = L_negate( dft_res_gains_q_fx[index][0] ); /* Q31 */

            move16();