Commit 0274b244 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into 945-wrong-return-value-in-ivas_dec_getnumorientationsubframes
parents 31142848 300a2d13

.gitlab-ci.yml

+414 −79

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_ 
target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)



if(NOT WMOPS)

  add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)

  add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)

endif()

Workspace_msvc/lib_com.vcxproj.filters

+7 −2
Original line number Diff line number Diff line
@@ -472,7 +472,12 @@ 
    <ClCompile Include="..\lib_com\ivas_osba_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

Workspace_msvc/lib_isar.vcxproj.filters

0 → 100644
+109 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>

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

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

    <ClCompile Include="..\lib_isar\isar_lc3plus_common.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_lc3plus_dec.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_lc3plus_enc.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_lc3plus_payload.c">

      <Filter>isar_c</Filter>

    </ClCompile>

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

      <Filter>isar_c</Filter>

    </ClCompile>

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

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_MSPred.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_NoiseGen.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_PerceptualModel.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_PredDecoder.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_PredEncoder.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_RMSEnvGrouping.c">

      <Filter>isar_c</Filter>

    </ClCompile>

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

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_rom_post_rend.c">

      <Filter>isar_c</Filter>

    </ClCompile>

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

      <Filter>isar_c</Filter>

    </ClCompile>

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

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_splitRenderer_utils.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_splitRendererPLC.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_splitRendererPost.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_splitRendererPre.c">

      <Filter>isar_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

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

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

      <Filter>isar_h</Filter>

    </ClInclude>

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

      <Filter>isar_h</Filter>

    </ClInclude>

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

      <Filter>isar_h</Filter>

    </ClInclude>

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

      <Filter>isar_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_isar\isar_lc3plus_payload.h">

      <Filter>isar_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_isar\isar_lcld_prot.h">

      <Filter>isar_h</Filter>

    </ClInclude>

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

      <Filter>isar_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_isar\isar_prot.h">

      <Filter>isar_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_isar\isar_rom_post_rend.h">

      <Filter>isar_h</Filter>

    </ClInclude>

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

      <Filter>isar_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="isar_c">

      <UniqueIdentifier>{afca9c26-7922-4c24-aa3a-cbf00aa2b6d1}</UniqueIdentifier>

    </Filter>

    <Filter Include="isar_h">

      <UniqueIdentifier>{1ce7afb2-7474-42f5-b477-2d854c093429}</UniqueIdentifier>

    </Filter>

  </ItemGroup>

</Project>
 
 No newline at end of file

Workspace_msvc/lib_util.vcxproj

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

  <ItemGroup>

    <ClCompile Include="..\lib_util\aeid_file_reader.c" />

    <ClCompile Include="..\lib_util\ambi_convert.c" />

    <ClCompile Include="..\lib_util\audio_file_reader.c" />

    <ClCompile Include="..\lib_util\audio_file_writer.c" />

    <ClCompile Include="..\lib_util\bitstream_reader.c" />
@@ -128,6 +129,7 @@ 
  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_util\aeid_file_reader.h" />

    <ClInclude Include="..\lib_util\ambi_convert.h" />

    <ClInclude Include="..\lib_util\audio_file_reader.h" />

    <ClInclude Include="..\lib_util\audio_file_writer.h" />

    <ClInclude Include="..\lib_util\bitstream_reader.h" />