Commit 86a5765b authored by vaclav's avatar vaclav
Browse files

issue 729: fix ASAN ACELP errors with 2 ISM coding using LTV; under FIX_729_ASAN_2ISM_ACELP

parent 8bef1c48

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define FIX_718_JBM_MD_UDPATE                           /* Fhg: fix issue #718, wrong setting of the update flag in the TD obj renderer in the JBM path */

#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */



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



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

lib_enc/ivas_decision_matrix_enc.c

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

    }



#ifdef 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;

        st->coder_type = AUDIO;

        st->sp_aud_decision2 = 1;

    }



#endif



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

     * Select ACELP and GSC extension layer

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