Commit 3f343bc7 authored by sagnowski's avatar sagnowski
Browse files

Manually re-apply changes made by @vaclav 

Original commit message:

- move ivas_td_decorr.c into lib_com
- rename TD related functions and remove "spar" name from them
parent 96d7422f

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ 
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c" />

    <ClCompile Include="..\lib_com\ivas_td_decorr.c" />

    <ClCompile Include="..\lib_com\ivas_tools.c" />

    <ClCompile Include="..\lib_com\ivas_transient_det.c" />

    <ClCompile Include="..\lib_com\lag_wind.c" />

Workspace_msvc/lib_com.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -463,6 +463,9 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_imdct.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_td_decorr.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

Workspace_msvc/lib_dec.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -470,9 +470,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_agc_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

lib_com/ivas_prot.h

+10 −10
Original line number Diff line number Diff line
@@ -4116,23 +4116,23 @@ void ivas_cov_smooth_process( 
);



/* Transient detector module */

ivas_error ivas_spar_transient_det_open( 

    ivas_trans_det_state_t **hTranDet,                          /* i/o: SPAR TD handle                          */

ivas_error ivas_transient_det_open( 

    ivas_trans_det_state_t **hTranDet,                          /* i/o: Transient detector handle               */

    const int32_t sampling_rate                                 /* i  : sampling rate                           */

);



void ivas_spar_transient_det_close( 

    ivas_trans_det_state_t **hTranDet                           /* i/o: SPAR TD  handle                         */

void ivas_transient_det_close( 

    ivas_trans_det_state_t **hTranDet                           /* i/o: Transient detector handle               */

);



int16_t ivas_transient_det_process( 

    ivas_trans_det_state_t *hTranDet,                           /* i/o: SPAR TD handle                          */

    ivas_trans_det_state_t *hTranDet,                           /* i/o: Transient detector handle               */

    float *pIn_pcm,                                             /* i  : input audio channels                    */

    const int16_t frame_len                                     /* i  : frame length in samples                 */

);



void ivas_td_decorr_get_ducking_gains( 

    ivas_trans_det_state_t *hTranDet,                           /* i/o: SPAR TD handle                          */

    ivas_trans_det_state_t *hTranDet,                           /* i/o: Transient detector handle               */

    float *pIn_pcm, 

    float *pIn_duck_gains, 

    float *pOut_duck_gains,
@@ -4140,15 +4140,15 @@ void ivas_td_decorr_get_ducking_gains( 
    const int16_t tdet_flag 

);



ivas_error ivas_spar_td_decorr_dec_open( 

    ivas_td_decorr_state_t **hTdDecorr,                         /* i/o: SPAR Covar. decoder handle              */

ivas_error ivas_td_decorr_dec_open( 

    ivas_td_decorr_state_t **hTdDecorr,                         /* i/o: TD decorrelator handle                  */

    const int32_t output_Fs,                                    /* i  : output sampling rate                    */

    const int16_t nchan_internal,                               /* i  : number of internal channels             */

    const int16_t ducking_flag                                  /* i  : ducking flag                            */

);



void ivas_spar_td_decorr_dec_close( 

    ivas_td_decorr_state_t **hTdDecorr                          /* i/o: SPAR Covar. decoder handle              */

void ivas_td_decorr_dec_close( 

    ivas_td_decorr_state_t **hTdDecorr                          /* i/o: TD decorrelator handle                  */

);



void ivas_td_decorr_process(