Commit e1e7eeb4 authored by vaclav's avatar vaclav
Browse files

Merge branch '1240-st-tcx_only-set-after-ivas_decision_matrix_enc' into 'main' 

[non-BE] Resolve "st->tcx_only set after ivas_decision_matrix_enc()"

See merge request !1905
parents 8fdab6d9 1530a39e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#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 */



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

lib_enc/ivas_decision_matrix_enc.c

+5 −0
Original line number Diff line number Diff line
@@ -172,7 +172,12 @@ 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;

    }