Commit f338a735 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 890-mismatch-of-the-expected-and-provided-function-argument-size-in-renderismtomasa

# Conflicts:
#	lib_com/options.h
parents 07b2a482 7b887f9d

Workspace_msvc/lib_com.vcxproj

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

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

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_rend.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ 
    <ClCompile Include="..\lib_rend\ivas_rotation.c" />

    <ClCompile Include="..\lib_rend\ivas_rom_rend.c" />

    <ClCompile Include="..\lib_rend\ivas_shoebox.c" />

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

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

    <ClCompile Include="..\lib_rend\lib_rend.c" />

  </ItemGroup>

Workspace_msvc/lib_rend.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ 
    <ClCompile Include="..\lib_rend\ivas_lcld_encoder.c">

      <Filter>rend_c</Filter>

    </ClCompile>

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

      <Filter>rend_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\lib_rend.h" />

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -3714,6 +3714,7 @@ void ivas_dirac_dec_render_sf( 
    float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX]

);



#ifndef FIX_865_MOVE_TD_DECORR

ivas_error ivas_td_decorr_reconfig_dec(

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

    const int32_t ivas_total_brate,                             /* i  : total IVAS bitrate                      */
@@ -3723,6 +3724,7 @@ ivas_error ivas_td_decorr_reconfig_dec( 
    uint16_t *useTdDecorr                                       /* i/o: TD decorrelator flag                    */

);



#endif

void computeDiffuseness_mdft(

    float **buffer_intensity[DIRAC_NUM_DIMS],

    const float *buffer_energy,
@@ -4655,6 +4657,7 @@ void ivas_td_decorr_get_ducking_gains( 
    const int16_t tdet_flag 

);



#ifndef FIX_865_MOVE_TD_DECORR

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                    */
@@ -4680,6 +4683,7 @@ void ivas_td_decorr_APD_iir_filter( 
    const int16_t length

);



#endif

#define IVAS_CMULT_FLOAT( in1_re, in1_im, in2_re, in2_im, out1_re, out1_im ) \

    out1_re = ( in1_re * in2_re ) - ( in1_im * in2_im ); MAC(1); MULT(1);    \

    out1_im = ( in1_re * in2_im ) + ( in2_re * in1_im ); MAC(1); MULT(1);