Commit a54a59b1 authored by vaclav's avatar vaclav
Browse files

Merge branch '729-asan-acelp-errors-with-2-ism-coding-using-ltv' into 'main' 

Resolve "ASAN: ACELP errors with 2 ISM coding using LTV"

See merge request !1027
parents 5088f0e7 bdbecf51

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -160,13 +160,14 @@ 


/* #################### End BE switches ################################## */





/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt selection floating point code */

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



#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */

#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/

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





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

lib_enc/ivas_decision_matrix_enc.c

+8 −0
Original line number Diff line number Diff line
@@ -224,6 +224,14 @@ 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

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