Commit 04925ae7 authored by vaclav's avatar vaclav
Browse files

harmonization of code

parent 1ac6d996

Workspace_msvc/lib_dec.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ 
    <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_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

+3 −0
Original line number Diff line number Diff line
@@ -503,6 +503,9 @@ 
    <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>

  </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_prot.h

+21 −11
Original line number Diff line number Diff line
@@ -941,6 +941,14 @@ void ivas_param_ism_params_to_masa_param_mapping( 
);



#ifdef PARAM_ISM_DTX_CNG

/*----------------------------------------------------------------------------------*

 * ISM DTX prototypes

 *----------------------------------------------------------------------------------*/



ivas_error ivas_ism_dtx_open(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure              */

);



void ivas_param_ism_metadata_dtx_enc(

    BSTR_ENC_HANDLE hBstr,                                      /* i/o: bitstream handle                    */

    ISM_METADATA_HANDLE hIsmMeta[],                             /* i  : ISM metadata handles                */
@@ -960,8 +968,10 @@ void ivas_param_ism_compute_noisy_speech_flag( 
    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure              */ 

);



void ivas_param_ism_get_DTX_flag( 

        Encoder_Struct *st_ivas /* i/o: IVAS encoder structure          */

/*! r: indication of DTX frame */

int16_t ivas_ism_dtx_enc(

    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure              */

    int16_t *sid_flag                                           /* o  : indication of SID frame             */

);



void ivas_param_ism_coh_estim_dtx_enc(