Commit 43c76473 authored by malenov's avatar malenov Committed by Sandesh Venkatesh
Browse files

Fix the logic reading the GSC_IVAS_mode parameter in OMASA format

parent ace75c67

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
#define FIX_1113_OPT_DIRAC_BIN_REND             /* FhG: Various optimizations to ivas_dirac_dec_binaual_functions.c */

#define FIX_ISSUE_1187                          /* Ittiam: Fix for issue 1187: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from bass_pf_enc_fx function*/

#define FIX_ISSUE_1186                          /* Ittiam: Fix for Issue 1186: Energy/scaling issue for ISM-1 at all bitrates */

<<<<<<< HEAD

#define FIX_ISSUE_1165                          /* Ittiam: Fix for issue 1165: Assertion in lpc2lsp_fx for OMASA LTV input */

#define FIX_ISSUE_1185                          /* Ittiam: Fix for issue 1185: Assertion in ivas_dirac_dec_binaural_internal_fx() for crash in decoder in fft30_with_cmplx_data()*/

#define FIX_ISSUE_1209                          /* Ittiam: Fix for issue 1209: Assertion exit in BASOP encoder (stereo_dmx_evs)*/
@@ -135,4 +136,5 @@ 
#define FIX_1010_OPT_NORM_NOSAT                 /* FhG: SVD complexity optimizations (non-be) */

#define FIX_1010_OPT_SEC_SINGLE_RESCALE         /* FhG: SVD complexity optimizations (non-be) */

#define NONBE_1211_DTX_BR_SWITCHING             /* VA: port float issue 1211: fix crash in MASA DTX bitrate switching */

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

#endif

lib_dec/acelp_core_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -614,7 +614,11 @@ ivas_error acelp_core_dec_fx( 
        {

            test();

            test();

#ifdef FIX_1189_GSC_IVAS_OMASA

            IF( EQ_16( st_fx->coder_type, AUDIO ) || ( EQ_16( st_fx->coder_type, INACTIVE ) && EQ_16( st_fx->inactive_coder_type_flag, 1 ) ) )

#else

            IF( EQ_16( st_fx->coder_type, AUDIO ) || ( ( st_fx->coder_type == INACTIVE ) && LE_32( st_fx->total_brate, MAX_GSC_INACTIVE_BRATE ) ) )

#endif

            {

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

                move16();

lib_dec/acelp_core_dec_ivas_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -611,7 +611,11 @@ ivas_error acelp_core_dec_ivas_fx( 
        {

            test();

            test();

#ifdef FIX_1189_GSC_IVAS_OMASA

            IF( EQ_16( st_fx->coder_type, AUDIO ) || ( EQ_16( st_fx->coder_type, INACTIVE ) && EQ_16( st_fx->inactive_coder_type_flag, 1 ) ) )

#else

            IF( EQ_16( st->coder_type, AUDIO ) || ( st->coder_type == INACTIVE && LE_32( st->total_brate, MAX_GSC_INACTIVE_BRATE ) ) )

#endif

            {

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

                move16();