Commit 8e46888e authored by PLAINSI's avatar PLAINSI
Browse files

Merge branch 'main' into 836-paramupmix-mc-to-sba-conversion-done-on-the-already-binaurlized-output

parents d6f058bd f7009545

.gitlab-ci.yml

+41 −4
Original line number Diff line number Diff line
@@ -337,6 +337,30 @@ build-codec-sanitizers-linux: 
    # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<

    - ci/check_for_warnings.py $BUILD_OUTPUT || exit $?



build-codec-include-split-linux-make:

  extends:

    - .build-job-with-check-for-warnings

    - .rules-basis

  script:

    - *print-common-info

    - make -j INCLUDE_SPLIT=1 2>&1 | tee $BUILD_OUTPUT

    # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<

    - ci/check_for_warnings.py $BUILD_OUTPUT || exit $?



build-codec-include-split-linux-cmake:

  extends:

    - .build-job-with-check-for-warnings

    - .rules-basis

  script:

    - *print-common-info

    - mkdir build

    - cd build

    - cmake .. -DINCLUDE_SPLIT=1

    - cd ..

    - make -C build -j 2>&1 | tee $BUILD_OUTPUT

    # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<

    - ci/check_for_warnings.py $BUILD_OUTPUT || exit $?



build-codec-windows-cmake:

  extends:

    - .build-job-windows-with-check-for-warnings
@@ -350,6 +374,19 @@ build-codec-windows-cmake: 
    - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression

    - ("exit $LASTEXITCODE") | Invoke-Expression



build-codec-windows-include-split-cmake:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild

    - cmake --build build -j | tee -variable winoutdata

    - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8

    - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression

    - ("exit $LASTEXITCODE") | Invoke-Expression



build-codec-windows-msbuild:

  extends:

    - .build-job-windows-with-check-for-warnings
@@ -1334,7 +1371,7 @@ sanitizer-test-masa: 
    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 21 hours

  timeout: 5 hours

  timeout: 7 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -1485,9 +1522,9 @@ coverage-test-on-main-scheduled: 
    - make GCOV=1 -j

    - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script

    - python3 tests/create_short_testvectors.py

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n auto --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - bash ci/smoke_test.sh coverage

    - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py

    - bash ci/ivas_voip_be_test.sh coverage

CMakeLists.txt

+4 −12
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ if(UNIX) 
  # C compiler flags

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter -Wno-unused-function")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter")

  # CLANG

  if(CLANG)

    find_program(clangBin NAMES /home/amm-archiv/soft/Linux/clang/current/bin/clang clang REQUIRED)
@@ -89,8 +89,8 @@ if(UNIX) 
  endif()

  # GCOV

  if(GCOV)

    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")

    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")

    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage -fprofile-update=atomic")

    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -fprofile-update=atomic")

  endif()

  # STRIP

  if(STRIP)
@@ -162,10 +162,6 @@ if(INCLUDE_SPLIT) 
  endif()

endif()



if(INCLUDE_SPLIT)

  file(GLOB libCldfbTransCodecSrcs "lib_rend/ivas_cldfb_trans_codec/*.c")

  file(GLOB libCldfbTransCodecHeaders "lib_rend/ivas_cldfb_trans_codec/*.h")

endif()

file(GLOB libRendSrcs "lib_rend/*.c")

file(GLOB libRendHeaders "lib_rend/*.h")

if(NOT INCLUDE_SPLIT)
@@ -184,11 +180,7 @@ if(NOT INCLUDE_SPLIT) 
  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_rom_tables.*\.h$")

endif()



if(INCLUDE_SPLIT)

  add_library(lib_rend ${libRendSrcs} ${libCldfbTransCodecSrcs} ${libRendHeaders}  ${libCldfbTransCodecHeaders})

else()

add_library(lib_rend ${libRendSrcs} ${libRendHeaders})

endif()

target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

if(INCLUDE_SPLIT)

  target_link_libraries(lib_rend lib_lc3plus)

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ LDFLAGS += -g3 
endif



ifeq "$(GCOV)" "1"

CFLAGS  += -fprofile-arcs -ftest-coverage

LDFLAGS += -fprofile-arcs -ftest-coverage

CFLAGS  += -fprofile-arcs -ftest-coverage -fprofile-update=atomic

LDFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic

endif



ifeq "$(STRIP)" "1"

Workspace_msvc/lib_dec.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_svd_dec.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+0 −3
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_dec\ivas_vbap.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>