Unverified Commit 0955267f authored by norvell's avatar norvell
Browse files

Merge with main

parents d0e22548 0e9941c4

Workspace_msvc/lib_com.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+3 −6
Original line number Diff line number Diff line
@@ -265,12 +265,6 @@ 
    <ClCompile Include="..\lib_com\get_gain_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -481,6 +475,9 @@ 
    <ClCompile Include="..\lib_com\rom_com_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

lib_com/gs_bitallocation_fx.c

+945 −276

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/gs_bitallocation_ivas_fx.c

deleted100644 → 0
+0 −1170

File deleted.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -1879,6 +1879,7 @@ void TonalMDCTConceal_Detect_ivas_fx( 
);





#ifndef HARMONIZE_FUNC

void ivas_DetectTonalComponents_fx(

    Word16 indexOfTonalPeak[],

    Word16 lowerIndex[],
@@ -1899,7 +1900,7 @@ void ivas_DetectTonalComponents_fx( 
    const PsychoacousticParameters *psychParamsCurrent,

    Word16 element_mode 

);



#endif

ivas_error stereo_dft_dec_create_fx(

    STEREO_DFT_DEC_DATA_HANDLE *hStereoDft,                     /* i/o: decoder DFT stereo handle               */

    const Word32 element_brate,                                 /* i  : element bitrate                         */