Commit fd5bf4ae authored by emerit's avatar emerit
Browse files

Merge branch 'main' into update_crend_v2

parents 9e3713b7 b8cd21fc

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ 
    <ClInclude Include="..\lib_com\ivas_error.h" />

    <ClInclude Include="..\lib_com\ivas_error_utils.h" />

    <ClInclude Include="..\lib_com\ivas_prot.h" />

    <ClInclude Include="..\lib_com\ivas_prot_fx.h" />

    <ClInclude Include="..\lib_com\ivas_rom_com.h" />

    <ClInclude Include="..\lib_com\ivas_stat_com.h" />

    <ClInclude Include="..\lib_com\move.h" />

Workspace_msvc/lib_com.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -501,6 +501,9 @@ 
      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\options_warnings.h" />

    <ClInclude Include="..\lib_com\ivas_prot_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

lib_com/ivas_prot.h

+3 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ ivas_error pre_proc_front_ivas_fx( 
    const Word16 front_vad_dtx_flag, /* i  : front-VAD DTX flag to overwrite VAD decision				Q0*/

    const IVAS_FORMAT ivas_format,   /* i  : IVAS format												*/

    const Word16 MCT_flag,           /* i  : hMCT handle allocated (1) or not (0)						Q0*/

#ifdef NONBE_1211_DTX_BR_SWITCHING

    const Word32 last_ivas_total_brate, /* i  : last IVAS total bitrate                                    Q0*/

#endif

    const Word32 ivas_total_brate,   /* i  : IVAS total bitrate - for setting the DTX					Q0*/

    Word16 *Q_new

#ifdef DEBUG_MODE_INFO

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -151,4 +151,6 @@ 
#define FIX_1010_OPT_GIVENS_INV                 /* FhG: SVD complexity optimizations (non-be) */

#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_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->coder_type, AUDIO ) || ( EQ_16( st->coder_type, INACTIVE ) && EQ_16( st->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();