Commit c98bfe54 authored by Anika Treffehn's avatar Anika Treffehn
Browse files

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

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 588-update-mc-cldfb-domain-hrtfs
parents 70ba78ee 32aa5004

Workspace_msvc/lib_dec.vcxproj.filters

+2 −6
Original line number Diff line number Diff line
@@ -439,9 +439,6 @@ 
    <ClCompile Include="..\lib_dec\lead_deindexing.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -520,6 +517,7 @@ 
    <ClCompile Include="..\lib_dec\waveadjust_fec_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\ivas_stat_dec.h">
@@ -558,9 +556,7 @@ 
    <ClInclude Include="..\lib_dec\rom_dec.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

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

      <Filter>decoder_h</Filter>

    </ClInclude>

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

  </ItemGroup>

  <ItemGroup>

    <Filter Include="decoder_all_c">

Workspace_msvc/lib_enc.vcxproj.filters

+4 −2
Original line number Diff line number Diff line
@@ -590,10 +590,12 @@ 
    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_osba_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_osba_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\ivas_stat_enc.h">

apps/decoder.c

+93 −67

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+102 −89

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/bitstream.c

+1 −1
Original line number Diff line number Diff line
@@ -2712,7 +2712,7 @@ ivas_error preview_indices( 
                st_ivas->nchan_transport++;

                k--;

            }

            st_ivas->transport_config = AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport;

            st_ivas->transport_config = IVAS_AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport;



            st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_transport, total_brate );

            st_ivas->nSCE = st_ivas->nchan_transport;