Commit 270ae8ce authored by multrus's avatar multrus
Browse files

fix condition in tcx_encoder_memory_update_*_fx(), bring inline with float

parent 07e5f4e6

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define HARMONIZE_2595_reconfig_decoder_LPD             /* FhG: Harmonize reconfig_decoder_LPD with its ivas derivate */

#define HARMONIZE_2596_SetModeIndex                     /* FhG: Harmonize SetModeIndex with its ivas derivate */

#define FIX_BASOP_2550_TCX_ENC_MEM_UPDATE               /* FhG: fix condition in tcx_encoder_memory_update_*_fx(), bring inline with float */



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

lib_enc/tcx_utils_enc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -2406,7 +2406,11 @@ 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 ) )
@@ -2483,7 +2487,11 @@ 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 ) )