Commit 414a5cef authored by multrus's avatar multrus
Browse files

Merge branch 'basop_issue_2613' into 'main' 

issue 2613: "Inconsistent comparison macros in function tdm_SCh_LSF_intra_pred_fx()"

See merge request !3061
parents 3ad0262c b83f48b8

lib_com/ivas_stereo_td_bit_alloc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -716,7 +716,11 @@ void tdm_SCh_LSF_intra_pred_fx( 
        fixed_beta = 30801; // 0.94f in Q15

        move16();

    }

#ifndef FIX_ISSUE_2613_WRONG_COMP_MACRO

    ELSE IF( element_brate <= IVAS_24k4 )

#else

    ELSE IF( LE_32( element_brate, IVAS_24k4 ) )

#endif // !FIX_ISSUE_2613_WRONG_COMP_MACRO

    {

        fixed_beta = 29818; // 0.91f in Q15

        move16();

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ 
#define HARMONIZE_2598_tcx_arith_decode_envelope        /* FhG: harmonize tcx_arith_decode_envelope between EVS and IVAS versions */

#define HARMONIZE_2598_tcx_arith_encode_envelope        /* FhG: harmonize tcx_arith_encode_envelope between EVS and IVAS versions */

#define FIX_ISSUE_2594_FALSE_COMMENT                    /* FhG: basop issue 2594: fixing false comments about Q value*/

#define FIX_ISSUE_2616_BOUNDARY_CONDITION               /* FhG: basopo issue 2616: Inconsistent boundary conditions in function stereo_dft_dequantize_res_gains*/

#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*/



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