Commit 466586d6 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch... 

Merge branch 'basop-2498-mismatching-logic-operator-in-ivas_decision_matrix_enc_fx-between-basop-and-float' into 'main'

Resolve "Mismatching logic operator in ivas_decision_matrix_enc_fx between BASOP and float"

Closes #2498

See merge request !2916
parents 0f4cbdcc 6a653e1b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
#define FIX_BASOP_2491_MDCT_JBM_CLICK                   /* FhG: BASOP #2491: Fix Q_synth after TCX concealment (using ACELP concealment) */

#define FIX_1563_FIX_STEREO_SW                          /* VA: float issue 1563: fix clicks in stereo switching */

#define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */

#define FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX    /* Nokia: BASOP 2498: Fix the logic */



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

lib_enc/ivas_decision_matrix_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -107,7 +107,11 @@ void ivas_decision_matrix_enc_fx( 
        move16();



        test();

#ifdef FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX

        if ( GE_32( st->input_Fs, 32000 ) && GE_16( st->bwidth, SWB ) )

#else

        if ( GE_32( st->input_Fs, 32000 ) || GE_16( st->bwidth, SWB ) )

#endif

        {

            st->extl = SWB_CNG;

            move16();