Commit 15da5ebb authored by vaclav's avatar vaclav
Browse files

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

Merge remote-tracking branch 'remotes/origin/main' into 336-coding-of-mct_chan_mode_ignore-channel -> DOES NOT WORK
parents 76099774 43a6b2d3

.gitignore

+17 −12
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
IVAS_cod

IVAS_dec

IVAS_rend

IVAS_crend_unit_test

obj/

*.a

*.o
@@ -17,7 +16,6 @@ build*/**/* 
IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

IVAS_crend_unit_test.exe

*.user

.vs/

Debug_*/
@@ -25,12 +23,6 @@ Release_*/ 
*.obj

*.pdb



# Unittests

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test.exe

scripts/ivas_pytests/tests/unit_tests/crend/Debug_*/

scripts/ivas_pytests/tests/unit_tests/crend/Release_*/



# Standalone TD object renderer

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe
@@ -39,6 +31,7 @@ scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe 
.DS_Store

.vscode

.cache

.idea

*.log

*.bak

.\#*
@@ -50,14 +43,14 @@ scripts/out/ 
scripts/self_test_summary.txt

scripts/cppp/

binary/

tests/renderer/cut

tests/renderer/ref

tests/dut

tests/ref

tests/**/[c|d]ut

tests/**/ref

tests/*/testv

scripts/testv/*_cut*.pcm

# default reference binary name

IVAS_cod_ref

IVAS_dec_ref

IVAS_rend_ref



# Python files that pop up when running scripts

__pycache__/
@@ -72,3 +65,15 @@ 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

+419 −30

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab/issue_templates/sanitizer_error.md

0 → 100644
+39 −0
Original line number Diff line number Diff line 
### Basic info



- Commit SHA: 



### Bug description



Clang (msan/asan?) sanitizer test in pipeline found an error:



<!--- Copy sanitizer traceback from command line here -->

```



```



<!--- Copy test job URL here -->

Link to test pipeline: XXX



### Ways to reproduce



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 -->

```

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

```

or directly:



```

make clean

make -j CLANG=X

./IVAS_cod ...

eid-xor -vbr -fer bit ep_015.g192 bit_fer

./IVAS_dec ...

```



<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.

      Add further information to the first row and remove and add labels as necessary.  -->



/label ~"Priority::Critical" ~Company: ~Subpart:

/label ~Type:Bug ~Status::ToDo

CMakeLists.txt

+45 −14
Original line number Diff line number Diff line
@@ -70,8 +70,20 @@ if(UNIX) 
      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")

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

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

      # NOTE: keep in sync with list in Makefile

      set(USAN_CHECKS_ENABLE

        undefined # Default checks

        # Extra checks

        float-divide-by-zero

        implicit-conversion

        local-bounds

      )

      list(JOIN USAN_CHECKS_ENABLE "," USAN_CHECKS_ENABLE)



      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}")

    else()

      message(FATAL_ERROR "Unknown CLANG setting: ${CLANG}")

    endif()

  endif()

  # GCOV
@@ -112,45 +124,60 @@ project(stereo-evs) 
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer

include(CTest)



include_directories(

  lib_com

  lib_debug

  lib_dec

  lib_enc

  lib_rend

  lib_util

)



file(GLOB libComSrcs "lib_com/*.c")

file(GLOB libComHeaders "lib_com/*.h")

add_library(lib_com ${libComSrcs} ${libComHeaders})

if(UNIX)

  target_link_libraries(lib_com m)

  target_link_libraries(lib_com PRIVATE m)

endif()

target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug lc3plus)



file(GLOB libDebugSrcs "lib_debug/*.c")

file(GLOB libDebugHeaders "lib_debug/*.h")

add_library(lib_debug ${libDebugSrcs} ${libDebugHeaders})

target_link_libraries(lib_debug lib_com)

target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend)



file(GLOB libEncSrcs "lib_enc/*.c")

file(GLOB libEncHeaders "lib_enc/*.h")

add_library(lib_enc ${libEncSrcs} ${libEncHeaders})

target_link_libraries(lib_enc lib_com lib_debug)

target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend lc3plus)



file(GLOB libLC3plusSrcs "lc3plus/*.c")

file(GLOB libLC3plusHeaders "lc3plus/*.h")

add_library(lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})

target_include_directories(lc3plus PUBLIC lc3plus)

target_link_libraries(lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly

if(WMOPS)

  target_link_libraries(lc3plus lib_debug)

endif()



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

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

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

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

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

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

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

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

target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc)





file(GLOB libDecSrcs "lib_dec/*.c")

file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_rend lib_debug)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")

add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})

target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug lc3plus)



if(NOT WMOPS)

  file(GLOB unitTestIvasLc3plusSrcs "scripts/split_rendering/lc3plus/*.c")

  add_executable(ivas_lc3plus_unit_test ${unitTestIvasLc3plusSrcs})

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug)

endif()



add_executable(IVAS_cod apps/encoder.c)

target_link_libraries(IVAS_cod lib_enc lib_util)
@@ -166,12 +193,16 @@ endif() 


add_executable(IVAS_rend apps/renderer.c)

target_link_libraries(IVAS_rend lib_rend lib_util)

target_include_directories(IVAS_rend PRIVATE lib_enc)



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_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}/")

  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")

  endif()

endif()



# Allow creating packages for CMake install