Commit 70f2e0f6 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_729_ASAN_2ISM_ACELP

parent e71c6f6a

lib_com/options.h

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





#define NONBE_FIX_729_ASAN_2ISM_ACELP                         /* VA: issue 729: fix ASAN ACELP errors with 2 ISM coding using LTV */

#define NONBE_FIX_698_SBA_MSAN                                /* Dlb: issue 698: Uninitialized memory read in SBA init */

#define NONBE_FIX_694_OMASA_ACELP                             /* Nokia: Issue #694: OMASA crash in ACELP with extreme item */

#define NONBE_FIX_770_PLANAR_SBA_JBM                          /* FhG  : Issue #770: Crash in planar FOA decoding with JBM caused by uninitialized value */

lib_enc/ivas_decision_matrix_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -224,13 +224,11 @@ void ivas_decision_matrix_enc( 
        }

    }



#ifdef NONBE_FIX_729_ASAN_2ISM_ACELP

    /* sanity check to avoid too low ACELP bitrate in case of "limitation to avoid too high bitrate in one active TCX channel" at element_brate = 32000 */

    if ( st->is_ism_format && st->flag_ACELP16k && !st->low_rate_mode && st->core == ACELP_CORE && st->total_brate < ACELP_16k_LOW_LIMIT + FB_TBE_1k8 )

    {

        st->core = TCX_20_CORE;

    }

#endif



    /*---------------------------------------------------------------------*

     * Select ACELP and GSC extension layer