Commit b77b1568 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2550_TCX_ENC_MEM_UPDATE

parent 7055f528

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_BASOP_2550_TCX_ENC_MEM_UPDATE               /* FhG: fix condition in tcx_encoder_memory_update_*_fx(), bring inline with float */

#define FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP       /* FhG: remove dead (always-overwritten) gsMapping clamp in ic_bwe_enc_gsMapping_fx; float ref has no clamp */



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

lib_enc/tcx_utils_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -2406,11 +2406,7 @@ void tcx_encoder_memory_update_fx( 
    Copy( synth + sub( L_frame_glob, L_SYN_MEM ), LPDmem->mem_syn_r, L_SYN_MEM );



    test();

#ifdef FIX_BASOP_2550_TCX_ENC_MEM_UPDATE

    IF( st->tcxonly == 0 || EQ_16( L_frame_glob, L_FRAME16k ) )

#else

    IF( st->tcxonly == 0 || LE_16( L_frame_glob, L_FRAME16k ) )

#endif

    {

        /* Update excitation */

        IF( LT_16( L_frame_glob, L_EXC_MEM ) )
@@ -2478,11 +2474,7 @@ void tcx_encoder_memory_update_ivas_fx( 
    move16();



    test();

#ifdef FIX_BASOP_2550_TCX_ENC_MEM_UPDATE

    IF( st->tcxonly == 0 || EQ_16( L_frame_glob, L_FRAME16k ) )

#else

    IF( st->tcxonly == 0 || LE_16( L_frame_glob, L_FRAME16k ) )

#endif

    {

        /* Update excitation */

        IF( LT_16( L_frame_glob, L_EXC_MEM ) )