Commit 9f0af831 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into 1277-evs-float-and-basop-have-different-thresholds-for-dtx-high-rate-activation-2
parents 57b44246 7aa8874e

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -170,9 +170,9 @@ 


#define NONBE_FIX_GSC_BSTR                              /* VA: issue 1264: Fix bitstream synchronization between encoder and decoder in ACELP GSC in OMASA */

#define NONBE_1273_ISM_METADATA_COUNTER                 /* VA: issue 1273: fix counter overflow in ISM metadata encoder */

#define NONBE_1279_COUNTER_OVERFLOW                     /* VA: issue 1279: Avoid possible overflow of counter st->Nb_ACELP_frames */

#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */





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



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

lib_enc/acelp_core_enc.c

+7 −0
Original line number Diff line number Diff line
@@ -167,7 +167,14 @@ ivas_error acelp_core_enc( 
    {

        st->Nb_ACELP_frames = 0;

    }

#ifdef NONBE_1279_COUNTER_OVERFLOW

    if ( st->Nb_ACELP_frames < MAX16B )

    {

        st->Nb_ACELP_frames++;

    }

#else

    st->Nb_ACELP_frames++;

#endif



    if ( st->L_frame == L_FRAME )

    {