Commit 6d7ee423 authored by vaclav's avatar vaclav
Browse files

accept NON_BE_1055_RESET_LP_MEMORIES

parent 4673cbf6

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ 
/* all switches in this category should start with "NONBE_" */





#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/

lib_dec/updt_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -521,11 +521,7 @@ void updt_dec_common( 
        st->stab_fac_smooth_lt = ENV_SMOOTH_FAC * st->stab_fac + ( 1.0f - ENV_SMOOTH_FAC ) * st->stab_fac_smooth_lt;

    }



#ifdef NON_BE_1055_RESET_LP_MEMORIES

    if ( ( st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO ) ) )

#else

    if ( ( st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && st->codec_mode == MODE2 ) )

#endif

    {

        /* reset LP memories */

        set_zero( st->mem_MA, M );

lib_enc/core_enc_updt.c

+0 −4
Original line number Diff line number Diff line
@@ -92,11 +92,7 @@ void core_encode_update( 
        }

    }



#ifdef NON_BE_1055_RESET_LP_MEMORIES

    if ( ( st->Opt_DTX_ON && st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO ) ) )

#else

    if ( ( st->Opt_DTX_ON && st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && st->codec_mode == MODE2 ) )

#endif

    {

        /* reset LP memories */

        set_zero( st->mem_MA, M );