Commit 7aa8874e authored by vaclav's avatar vaclav
Browse files

Merge branch '1279-counter-st-nb_acelp_frames-can-overflow' into 'main' 

[non-BE] Resolve "Counter st->Nb_ACELP_frames can overflow"

See merge request !2011
parents cdcb9078 05091bc5

lib_com/options.h

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


#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 */



/* ##################### End NON-BE 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 )

    {