Commit c5f92942 authored by vaclav's avatar vaclav
Browse files

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

parents 6a9ab0a3 de2dc0db

.gitignore

+4 −12
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ 


# Compiler output Unix

IVAS_cod

IVAS_cod_fmtsw

IVAS_dec

IVAS_rend

ISAR_post_rend

ambi_converter

obj/

*.a

*.o
@@ -15,9 +17,11 @@ build*/**/* 


# Compiler output VS2017

IVAS_cod.exe

IVAS_cod_fmtsw.exe

IVAS_dec.exe

IVAS_rend.exe

ISAR_post_rend.exe

ambi_converter.exe

*.user

.vs/

Debug_*/
@@ -76,15 +80,3 @@ Externals/ 


# coan output files that are created when cleaning out switches

coan_out_*
 
/COMPLEXITY

/res

/tv

/wmops

/Workspace_msvc/renderer.args.json

/Workspace_msvc/encoder.args.json

/Workspace_msvc/decoder.args.json

/scripts/mem_analysis_enc_VBR_5k9.csv

/scripts/mem_analysis_enc_STEREO_sw.png

/scripts/mem_analysis_enc_STEREO_sw.csv

/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv

*.pwv

.gitlab-ci.yml

+16 −2480

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab/issue_templates/msan_ltv_error.md

+3 −8
Original line number Diff line number Diff line
@@ -16,12 +16,6 @@ Link to test pipeline: XXX 


### Ways to reproduce



Activate [origin-tracking](https://clang.llvm.org/docs/MemorySanitizer.html#msan-origins) (more detailed traceback about where the undefined value came from) by appending

```

 -fsanitize-memory-track-origins

```

in the `Makefile` at lines 71 and 72. Note that this may increase runtime heavily.



Using the [scripts](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/Software-development/pyivastest-howto#how-to-reproduce-tests):

<!--- check correct sanitizer type -->

<!--- add error pattern if needed -->
@@ -30,11 +24,12 @@ Using the [scripts](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/ 
```

python3 scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m MODE -p /path/to/my/local/ci_linux_ltv_local.json

```



or directly:



```

make clean

make -j CLANG=1

make -j CLANG=1 MSAN_TRACK_ORIGINS=1

./IVAS_cod ...

networkSimulator_g192 dly_profile.dat bit bit_err trace_dump 1

./IVAS_dec ...

CMakeLists.txt

+34 −12
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#        cmake --build . --config Release





cmake_minimum_required(VERSION 3.1)

cmake_minimum_required(VERSION 3.10)



set(CMAKE_C_STANDARD 99)
@@ -37,7 +37,8 @@ set(CMAKE_C_STANDARD 99) 
if(UNIX)

  set(TARGET_PLATFORM ""  CACHE STRING "i686 / x86_64")

  set(CLANG           ""  CACHE STRING "1=msan / 2=asan / 3=usan")

  set(GCOV            OFF CACHE BOOL   "enable GCOV")

  set(MSAN_TRACK_ORIGINS OFF CACHE BOOL "enable origin tracking for Clang MSAN")

  set(COVERAGE            OFF CACHE BOOL   "enable coverage instrumentation")

  set(STRIP           OFF CACHE BOOL   "enable STRIP")



  if(NOT CMAKE_BUILD_TYPE)
@@ -62,26 +63,32 @@ if(UNIX) 
  # to be uncommented in CI

  # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")



  # set C compiler

  find_program(cc NAMES clang-18 clang REQUIRED)

  set(CMAKE_C_COMPILER "${cc}" CACHE STRING "")



  # CLANG

  if(CLANG)

    find_program(clangBin NAMES /home/amm-archiv/soft/Linux/clang/current/bin/clang clang REQUIRED)

    set(CMAKE_C_COMPILER "${clangBin}" CACHE STRING "")

    if("${CLANG}" MATCHES "1" OR "${CLANG}" MATCHES "msan")

      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=memory")

      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=memory")

      if(MSAN_TRACK_ORIGINS)

        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize-memory-track-origins")

        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize-memory-track-origins")

      endif()

    elseif("${CLANG}" MATCHES "2" OR "${CLANG}" MATCHES "asan")

      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")

      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")

    elseif("${CLANG}" MATCHES "3" OR "${CLANG}" MATCHES "usan")

      # NOTE: keep in sync with list in Makefile

      set(USAN_CHECKS_ENABLE

      set(USAN_CHECKS_LIST

        undefined # Default checks

        # Extra checks

        float-divide-by-zero

        implicit-conversion

        local-bounds

      )

      list(JOIN USAN_CHECKS_ENABLE "," USAN_CHECKS_ENABLE)

      string(JOIN , USAN_CHECKS_ENABLE ${USAN_CHECKS_LIST})



      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")

      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")
@@ -89,8 +96,8 @@ if(UNIX) 
      message(FATAL_ERROR "Unknown CLANG setting: ${CLANG}")

    endif()

  endif()

  # GCOV

  if(GCOV)

  # COVERAGE

  if(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()
@@ -121,7 +128,7 @@ if(WMOPS) 
  add_definitions("-DWMOPS=1")

endif()



project(stereo-evs)

project(stereo-evs LANGUAGES C)

set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer

include(CTest)
@@ -174,8 +181,8 @@ 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)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)

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

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_com lib_debug lib_isar)

endif()



file(GLOB libISARSrcs "lib_isar/*.c")
@@ -192,6 +199,12 @@ if(WIN32) 
  target_link_libraries(IVAS_cod Ws2_32)

endif()



add_executable(IVAS_cod_fmtsw apps/encoder_fmtsw.c)

target_link_libraries(IVAS_cod_fmtsw lib_enc lib_util)

if(WIN32)

  target_link_libraries(IVAS_cod_fmtsw Ws2_32)

endif()



add_executable(IVAS_dec apps/decoder.c)

target_link_libraries(IVAS_dec lib_dec lib_util)

if(WIN32)
@@ -206,14 +219,23 @@ add_executable(ISAR_post_rend apps/isar_post_rend.c) 
target_link_libraries(ISAR_post_rend lib_isar lib_util)

target_include_directories(ISAR_post_rend PRIVATE lib_isar)



add_executable(ambi_converter apps/ambi_converter.c)

  target_link_libraries(ambi_converter lib_util)

if(UNIX)

  target_link_libraries(ambi_converter m)

endif()

target_include_directories(ambi_converter PRIVATE lib_util)



if(COPY_EXECUTABLES_FROM_BUILD_DIR)

  # Optionally copy executables to the same place where Make puts them (useful for tests that expect executables in specific places)

  add_custom_command(TARGET IVAS_cod POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_cod>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET IVAS_cod_fmtsw POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_cod_fmtsw>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET IVAS_dec POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_dec>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET ISAR_post_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ISAR_post_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET ambi_converter POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ambi_converter>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  if (NOT WMOPS)

    add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ivas_lc3plus_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus")

    add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ivas_lc3plus_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus_float")

  endif()

endif()

LICENSE.md

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2026 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other