Commit 441a528b authored by Manuel Jander's avatar Manuel Jander
Browse files

Disable NONBE_FIX_2493_CHECK_EXTRACT_L_EnhanceClass_fx and... 

Disable NONBE_FIX_2493_CHECK_EXTRACT_L_EnhanceClass_fx and NONBE_FIX_2493_CHECK_EXTRACT_L_decoder_tcx_post_fx (EVS BE).
parent 039b08da

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -137,12 +137,14 @@ 
#define FIX_BASOP_2571_MASA_EXT_RENDER_FIXES            /* Nokia: BASOP issue 2571: Fix MASA EXT DirAC renderer by unifying it with decoder */

#define NONBE_FIX_2575                                  /* Fhg: Fix issue 2575, precision loss in FD CNG */

#define FIX_2493_CHECK_EXTRACT_L                        /* FhG: Verify that extract_l, W_extract_l etc. do not encounter an overflow. */

// #define FIX_2493_CHECK_EXTRACT_L_EVS                    /* FhG: Verify that extract_l, W_extract_l etc. do not encounter an overflow for EVS modes. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_estDownmixGain_fx /* FhG: Fix extract_l overflow inside estDownmixGain_fx() */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_swb_pre_proc_fx  /* FhG: Fix extract_l overflow inside swb_pre_proc_fx() */

#define NONBE_FIX_2493_EXTRACT_L_spectral_balancer_fx16 /* FhG: Fix extract_l overflow inside spectral_balancer_fx16() */

#define NONBE_FIX_2493_EXTRACT_L_IGF_CalculateStereoEnvelope_fx /* FhG: Fix extract_l overflow inside IGF_CalculateStereoEnvelope_fx() */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_GetTCXMaxenergyChange_fx /* FhG: Fix extract_l overflow inside GetTCXMaxenergyChange_fx() */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_EnhanceClass_fx  /* FhG: Fix extract_l overflow inside EnhanceClass_fx() */

// #define NONBE_FIX_2493_CHECK_EXTRACT_L_EnhanceClass_fx  /* FhG: Fix extract_l overflow inside EnhanceClass_fx() (EVS) */

// #define NONBE_FIX_2493_CHECK_EXTRACT_L_decoder_tcx_post_fx /* FhG: Fix extract_l overflow inside decoder_tcx_post_fx() (EVS) */

#define FIX_2584_TD_SM_ISSUE                            /* VA: Fix inconsistencies in the SM part of the TD stereo */

#define FIX_2556_ALIGN_CONDITIONS                       /* VA: Fix different conditions that were not exact between float and fix, BE on self-test */

#define FIX_NONBE_2579_INCORRECT_LAG_CALCULATION        /* Dolby: fix 2579: Incorrect lag calculation */

lib_dec/dec_tcx_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -1322,11 +1322,16 @@ void decoder_tcx_post_fx( Decoder_State *st_fx, 
        tmp32_2 /*stepCompensate*/ = L_shl_r( L_deposit_h( hTcxDec->stepCompensate ), sub( hTcxDec->stepCompensate_e, 31 - 28 ) ); /*Q28*/

        FOR( i = 0; i < st_fx->L_frame; i++ )

        {

#ifdef NONBE_FIX_2493_CHECK_EXTRACT_L_decoder_tcx_post_fx

            tmp32 = L_shl_sat( tmp32_1 /*Q28*/, -( 28 - 15 ) + 16 ); /*16Q15*/

            xn_buf[i] = extract_h( Mpy_32_16_1( tmp32, xn_buf[i] ) );

#else

            tmp32 = L_shl( tmp32_1 /*Q28*/, -( 28 - 15 ) ); /*16Q15*/

#ifdef FIX_2493_CHECK_EXTRACT_L

#ifdef FIX_2493_CHECK_EXTRACT_L_EVS

            xn_buf[i] = extract_l2( Mpy_32_16_1( tmp32, xn_buf[i] ) );

#else

            xn_buf[i] = extract_l( Mpy_32_16_1( tmp32, xn_buf[i] ) );

#endif

#endif

            move16();

            tmp32_1 = L_sub( tmp32_1, tmp32_2 );

lib_dec/hf_synth_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ static Word16 EnhanceClass_fx( 
#ifdef NONBE_FIX_2493_CHECK_EXTRACT_L_EnhanceClass_fx

    unvoicing_tmp_fx = extract_h( L_shl_sat( L_tmp, 16 - 12 ) ); /*Q15 */

#else

#ifdef FIX_2493_CHECK_EXTRACT_L

#ifdef FIX_2493_CHECK_EXTRACT_L_EVS

    unvoicing_tmp_fx = extract_l2( L_shr( L_tmp, 12 ) ); /*Q15 */

#else

    unvoicing_tmp_fx = extract_l( L_shr( L_tmp, 12 ) ); /*Q15 */