Commit e65d31a1 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2550-review-conditions-in-tcx_encoder_memory_update_ivas_fx-tcx_encoder_memory_update_fx' into 'main'

Resolve "Review conditions in tcx_encoder_memory_update_ivas_fx(), tcx_encoder_memory_update_fx()"

Closes #2550

See merge request !3054
parents e3d6b8bb e9b82f91

lib_com/options.h

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

#define FIX_ISSUE_2611_WRONG_COMMENT                    /* FhG: basop issue 2611: Wrong Q value comment in fucntion stereo_dft_sg_recovery_fx()*/

#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 ) )
@@ -2474,7 +2478,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 ) )