Commit 1c5cc5c7 authored by eichenseer's avatar eichenseer
Browse files

Merge branch 'b20220920_ParamISM_DTX_CNG' into 'main' 

[non-BE] Contribution 9: DTX-CNG for ParamISM

See merge request !445
parents 3d611769 f26fb2af

Workspace_msvc/lib_dec.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ 
    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />

    <ClCompile Include="..\lib_dec\ivas_init_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+6 −0
Original line number Diff line number Diff line
@@ -503,6 +503,12 @@ 
    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_ism_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

Workspace_msvc/lib_enc.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ 
    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front.c" />

    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler.c" />

    <ClCompile Include="..\lib_enc\ivas_entropy_coder.c" />

    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_lfe_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_mc_param_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_pca_enc.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -584,6 +584,9 @@ 
    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\ivas_stat_enc.h">

lib_com/ivas_cnst.h

+15 −0
Original line number Diff line number Diff line
@@ -334,6 +334,12 @@ typedef enum 
#define PARAM_ISM_MAX_CHAN                      16

#define PARAM_ISM_HYS_BUF_SIZE                  10



#ifdef PARAM_ISM_DTX_CNG

#define PARAM_ISM_DTX_COH_SCA_BITS              4

#define PARAM_ISM_DTX_AZI_BITS                  5 

#define PARAM_ISM_DTX_ELE_BITS                  4

#endif



typedef enum 

{

    ISM_MODE_NONE,
@@ -348,9 +354,18 @@ enum 
    IND_ISM_NUM_OBJECTS,

    IND_ISM_METADATA_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,

    IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

#ifdef PARAM_ISM_DTX_CNG

    IND_ISM_SCE_ID_DTX = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_NOISY_SPEECH_FLAG,

    IND_ISM_DTX_COH_SCA,

#endif



    /* ------------- loop for objects -------------- */

#ifdef PARAM_ISM_DTX_CNG

    TAG_ISM_LOOP_START = IND_ISM_DTX_COH_SCA + MAX_NUM_OBJECTS,

#else

    TAG_ISM_LOOP_START = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,

    #endif

    IND_ISM_AZIMUTH_DIFF_FLAG = TAG_ISM_LOOP_START,

    IND_ISM_AZIMUTH = TAG_ISM_LOOP_START,

    IND_ISM_ELEVATION_DIFF_FLAG = TAG_ISM_LOOP_START,