Commit 26ae1a66 authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2530-error-prone-condition-in-ivas_decision_matrix_enc_fx' into 'main' 

Resolve "Error-prone condition in ivas_decision_matrix_enc_fx()"

Closes #2530

See merge request !2943
parents dd90d032 c4f38502

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ 
#define HARMONIZE_2494_FdCng_decodeSID_fx               /* FhG: harmonize FdCng_decodeSID_fx with _ivas_ version */

#define FIX_BASOP_2509_EVS_CONCEAL_UNINIT_MEM           /* FhG: BASOP 2509: st->hTcxCfg->psychParamsCurrent is not initialized */

#define HARMONIZE_2499_CONFIGUREFDCNGDEC                /* FhG: basop issue 2499: harmonoize configureFdCngDec */

#define FIX_BASOP_2530_IVAS_DECISION_MAT                /* VA: Fix ambiguous usage of extract_l() */





/* #################### End BE switches ################################## */
@@ -119,6 +121,7 @@ 
#define FIX_2505_IVAS_DEC_SEGFAULT                      /* FhG: BASOP #2505: Add headroom to input of ivas_rend_crendProcessSubframe_fx() for ivas_mdft_fx() calculation */

#define HARMONIZE_DoRTFTn                               /* VA: harmonize functions DoRTFTn_fx() and DoRTFTn_fx_ivas() */





/* ##################### End NON-BE switches ########################### */



/* ################## End MAINTENANCE switches ######################### */

lib_enc/ivas_decision_matrix_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -336,7 +336,11 @@ void ivas_decision_matrix_enc_fx( 
                st->extl = WB_BWE;

                move16();

            }

#ifdef FIX_BASOP_2530_IVAS_DECISION_MAT

            ELSE IF( GE_32( st->total_brate, MIN_BRATE_WB_BWE ) && !st->flag_ACELP16k )

#else

            ELSE IF( GE_16( extract_l( st->total_brate ), MIN_BRATE_WB_BWE ) && !st->flag_ACELP16k )

#endif

            {

                test();

                test();