Commit 24add4fd authored by multrus's avatar multrus
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1660-basop-porting-mr-195-port-mr-1466-from-float-implement-conversion-to-and-from-acn-sn3d
parents 322710f0 dfe16351

.gitlab-ci/variables.yml

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ variables: 
  RUNNER_TAG: "ivas-basop-linux"

  LOGS_BACKUP_SOURCE_DIR: ""

  LOGS_BACKUP_TARGET_DIR: ""

  # set this to true to skip the external HRTF testcases in pytest calls

  DISABLE_HRTF: "false"

  MANUAL_PIPELINE_TYPE:

    description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."

    value: 'default'
@@ -102,3 +104,4 @@ variables: 
      - 'peaq-enc-passthrough'

      - 'long-term-logs'

      - 'backup-long-term-logs'

      - 'test-long-self-test'

Workspace_msvc/decoder.vcxproj

+3 −1
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -129,6 +130,7 @@ 
      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Workspace_msvc/encoder.vcxproj

+3 −1
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -137,6 +138,7 @@ 
      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Workspace_msvc/lib_com.vcxproj

+4 −9
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -109,6 +110,7 @@ 
      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -215,9 +217,8 @@ 
    <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" />

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

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

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

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

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

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

    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c" />
@@ -263,7 +264,6 @@ 
    <ClCompile Include="..\lib_com\residu_fx.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\stab_est_fx.c" />
@@ -281,7 +281,6 @@ 
    <ClCompile Include="..\lib_com\tcx_utils_fx.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\trans_inv_fx.c" />
@@ -313,7 +312,6 @@ 
    <ClInclude Include="..\lib_com\ivas_error_utils.h" />

    <ClInclude Include="..\lib_com\ivas_prot_fx.h" />

    <ClInclude Include="..\lib_com\ivas_rom_com.h" />

    <ClInclude Include="..\lib_com\ivas_rom_com_fx.h" />

    <ClInclude Include="..\lib_com\ivas_stat_com.h" />

    <ClInclude Include="..\lib_com\log2.h" />

    <ClInclude Include="..\lib_com\math_32.h" />
@@ -326,12 +324,9 @@ 
    <ClInclude Include="..\lib_com\rom_basic_math.h" />

    <ClInclude Include="..\lib_com\rom_basop_util.h" />

    <ClInclude Include="..\lib_com\rom_com.h" />

    <ClInclude Include="..\lib_com\rom_com_fx.h" />

    <ClInclude Include="..\lib_com\stat_com.h" />

    <ClInclude Include="..\lib_com\stat_com_fx_2.h" />

    <ClInclude Include="..\lib_com\stl.h" />

    <ClInclude Include="..\lib_com\typedef.h" />

    <ClInclude Include="..\lib_com\options_warnings.h" />

    <ClInclude Include="..\lib_com\typedefs.h" />

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Workspace_msvc/lib_com.vcxproj.filters

+6 −28
Original line number Diff line number Diff line
@@ -73,15 +73,9 @@ 
    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>
@@ -184,9 +178,6 @@ 
    <ClCompile Include="..\lib_com\bits_alloc_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -439,12 +430,6 @@ 
    <ClCompile Include="..\lib_com\rom_basop_util.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -487,9 +472,6 @@ 
    <ClCompile Include="..\lib_com\tns_base.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -517,6 +499,12 @@ 
    <ClCompile Include="..\lib_com\wtda_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\ivas_error.h">
@@ -531,9 +519,6 @@ 
    <ClInclude Include="..\lib_com\ivas_stat_com.h">

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>
@@ -588,15 +573,9 @@ 
    <ClInclude Include="..\lib_com\rom_com.h">

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>
@@ -629,7 +608,6 @@ 
    </ClInclude>

    <ClInclude Include="..\lib_com\options.h" />

    <ClInclude Include="..\lib_com\common_api_types.h" />

    <ClInclude Include="..\lib_com\options_warnings.h" />

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_all_c">