Commit c57b04f8 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec into float-1521-sba-binaural-loudness
parents 02d8eb0b 39eb796c

Workspace_msvc/lib_dec.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ 
    <ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_dec\LD_music_post_filter.c" />
@@ -318,7 +317,6 @@ 
    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h" />

    <ClInclude Include="..\lib_dec\jbm_jb4_jmf.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h" />

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

Workspace_msvc/lib_dec.vcxproj.filters

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -532,9 +529,6 @@ 
    <ClInclude Include="..\lib_dec\jbm_jb4sb.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

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

      <Filter>decoder_h</Filter>

    </ClInclude>

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

      <Filter>decoder_h</Filter>

    </ClInclude>

apps/decoder.c

+105 −299

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+0 −23

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+8 −26

File changed.

Preview size limit exceeded, changes collapsed.