Commit 9b1f969e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX

parent 97f0c43b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ 


#define FIX_BASOP_2486_HQ_FINE_GAIN_ALIGNMENT           /* Eri: Basop issue 2486: IVAS BASOP used calculations with truncation, EVS BASOP used rounding. This aligns the use of a table lookup. */

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

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

#define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */

#define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN      /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */

#define FIX_2495_Q_ALIGN_OSBA_RENDERER                  /* FhG: Basop issue #2495: Corrected exponent scaling of outAudio.data_fx before buffer accumulation in renderSbaToBinaural(). */

lib_enc/ivas_decision_matrix_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -107,11 +107,7 @@ 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();