Commit 0904d582 authored by multrus's avatar multrus
Browse files

merge from main

parents 342b77c2 255fe356

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ variables: 
  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main



include:

  - local: .gitlab-ci/variables.yml

  - local: .gitlab-ci/rules-basis.yml

  - project: ivas-codec-pc/ivas-codec-ci

    ref: *IVAS_CODEC_CI_REF

    file: main-basop.yml

  - local: .gitlab-ci/variables.yml

  - local: .gitlab-ci/rules-basis.yml

Workspace_msvc/isar_post_rend.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\apps\isar_post_rend.c" />

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

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

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_debug.vcxproj">

Workspace_msvc/lib_com.vcxproj

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

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

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

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

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

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

    <ClCompile Include="..\lib_com\cb_shape_fx.c" />
@@ -212,6 +211,7 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c" />

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+302 −299

File changed.

Preview size limit exceeded, changes collapsed.

Workspace_msvc/lib_isar.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
  <ItemGroup>

    <ClCompile Include="..\lib_isar\isar_lcld_decoder.c" />

    <ClCompile Include="..\lib_isar\isar_lcld_encoder.c" />

    <ClCompile Include="..\lib_isar\isar_lcld_rom_tables.c" />

    <ClCompile Include="..\lib_isar\isar_rom_lcld_tables.c" />

    <ClCompile Include="..\lib_isar\isar_splitRend_lcld_enc.c" />

    <ClCompile Include="..\lib_isar\isar_splitRend_lcld_dec.c" />

    <ClCompile Include="..\lib_isar\isar_lc3plus_common.c" />
@@ -150,7 +150,7 @@ 
    <ClInclude Include="..\lib_isar\isar_prot.h" />

    <ClInclude Include="..\lib_isar\isar_stat.h" />

    <ClInclude Include="..\lib_isar\isar_cnst.h" />

    <ClInclude Include="..\lib_isar\isar_lcld_rom_tables.h" />

    <ClInclude Include="..\lib_isar\isar_rom_lcld_tables.h" />

    <ClInclude Include="..\lib_isar\isar_lc3plus_common.h" />

    <ClInclude Include="..\lib_isar\isar_lc3plus_dec.h" />

    <ClInclude Include="..\lib_isar\isar_lc3plus_enc.h" />