Commit 5de14576 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into update_crend_v2

parents e6546efd 7f488e0a

Workspace_msvc/lib_rend.vcxproj

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

  </ItemGroup>

  <ItemGroup>

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

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

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

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

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

Workspace_msvc/lib_rend.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,6 @@ 
  </ItemGroup>

  <ItemGroup>

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

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

      <Filter>rend_h</Filter>

    </ClInclude>

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

      <Filter>rend_h</Filter>

    </ClInclude>
@@ -143,6 +140,9 @@ 
    <ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h">

      <Filter>rend_h</Filter>

    </ClInclude>

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

      <Filter>rend_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="rend_h">

lib_com/ivas_prot.h

deleted100644 → 0
+0 −4064

File deleted.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_binRenderer_internal_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "options.h"

#include <math.h>

#include "prot_fx.h"

#include "ivas_prot_rend.h"

#include "ivas_prot_rend_fx.h"

#include "cnst.h"

#include "ivas_cnst.h"

#include "ivas_rom_rend.h"

lib_dec/ivas_cpe_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -352,10 +352,6 @@ ivas_error ivas_cpe_dec_fx( 
            {

                sts[0]->total_brate = hCPE->element_brate; /* Only mono downmix was transmitted in this case */

                move32();

#ifdef MSAN_FIX

                hCPE->hStereoDft->frame_sid_nodata = 0;

                move16();

#endif

            }

            ELSE

            {