Commit b83f48b8 authored by multrus's avatar multrus
Browse files

merge from main

parents 26441a41 3ad0262c

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
#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: 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 ################################## */

lib_dec/ivas_stereo_dft_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -445,7 +445,11 @@ 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] );

        }
@@ -456,7 +460,11 @@ 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();