Commit d3af63d1 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1240_FIX_CORE_SELECTION_ISM_SW

parent 2d2b9227

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_1240_FIX_CORE_SELECTION_ISM_SW            /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */

#define NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX      /* Ericsson: Issue 1246: High level input which triggers DTX can lead to numerical overflow in coherence calculation */

#define NONBE_1211_DTX_BR_SWITCHING                     /* VA: issue 1211: fix crash in MASA DTX bitrate switching */

#define NONBE_1217_INIT_OBJ_EDIT                        /* VA: issue 1217: do object editing only when objects metadata is available */

lib_enc/ivas_decision_matrix_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -172,12 +172,8 @@ void ivas_decision_matrix_enc( 
        st->core = ACELP_CORE;

    }



#ifdef NONBE_1240_FIX_CORE_SELECTION_ISM_SW

    /* sanity check: highest bitrates in ISM */

    if ( st->is_ism_format && st->tcxonly && st->total_brate > MAX_ACELP_BRATE_ISM )

#else

    if ( st->is_ism_format && st->tcxonly )

#endif

    {

        st->core = TCX_20_CORE;

    }