Commit 1c8b3243 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix BASOP issue 2498 by correcting the logic operator.

parent 7897b35e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
#define FIX_1547_ISMDTX_HANDLE                          /* VA: float issue 1547: fix use of 'hISMDTX' handle */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_BASOP_2491_MDCT_JBM_CLICK                   /* FhG: BASOP #2491: Fix Q_synth after TCX concealment (using ACELP concealment) */

#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();