Commit 6c847830 authored by vaclav's avatar vaclav
Browse files

fix within NONBE_1240_FIX_CORE_SELECTION_ISM_SW to not affect constant bitrate operations

parent a70256f9

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO            /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */

#define NONBE_1240_FIX_CORE_SELECCITON_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_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

+2 −2
Original line number Diff line number Diff line
@@ -172,9 +172,9 @@ void ivas_decision_matrix_enc( 
        st->core = ACELP_CORE;

    }



#ifdef NONBE_1240_FIX_CORE_SELECCITON_ISM_SW

#ifdef NONBE_1240_FIX_CORE_SELECTION_ISM_SW

    /* sanity check: highest bitrates in ISM */

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

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

#else

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

#endif