Commit 755253d9 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '1264-mirror-of-basop-issue-1889-bitstream-not-synchronizing-for-float-encode-float-decode-case' into 'main'

[non-BE] Resolve "Mirror of BASOP issue 1889 - Bitstream not synchronizing for float encode-float decode case"

See merge request !1970
parents eae9faa0 a58434fa

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ 
#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */



#define NONBE_FIX_1189_GSC_IVAS_OMASA                   /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */



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

lib_dec/acelp_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -483,7 +483,11 @@ ivas_error acelp_core_dec( 


        if ( st->element_mode > EVS_MONO && st->idchan == 0 && !( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && !tdm_low_rate_mode )

        {

#ifdef NONBE_FIX_1189_GSC_IVAS_OMASA

            if ( st->coder_type == AUDIO || ( st->coder_type == INACTIVE && st->inactive_coder_type_flag ) )

#else

            if ( st->coder_type == AUDIO || ( st->coder_type == INACTIVE && st->total_brate <= MAX_GSC_INACTIVE_BRATE ) )

#endif

            {

                st->GSC_IVAS_mode = get_next_indice( st, 2 );

            }