Commit e2c4a742 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 31-develop-performance-measurement-build

parents c1093821 c9148f12

.gitignore

+11 −5
Original line number Diff line number Diff line
@@ -3,17 +3,21 @@ 
# Compiler output Unix

IVAS_cod

IVAS_dec

IVAS_rend

IVAS_crend_unit_test

obj/

*.a

*.o

*.P



# default CMake

build/**/*

build*/**/*



# Compiler output VS2017

IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

IVAS_crend_unit_test.exe

*.user

.vs/

Debug_*/
@@ -31,13 +35,10 @@ scripts/ivas_pytests/tests/unit_tests/crend/Release_*/ 
scripts/td_object_renderer/object_renderer_standalone/renderer_standalone

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe



# Prerenderer

scripts/prerenderer/IVAS_prerenderer

scripts/prerenderer/IVAS_prerenderer.exe



# General/scripts

.DS_Store

.vscode

.cache

*.log

*.bak

scripts/c-code_instrument/
@@ -46,6 +47,8 @@ scripts/ref/ 
scripts/test/

scripts/out/

scripts/self_test_summary.txt

tests/renderer/cut

tests/renderer/ref

tests/dut

tests/ref
@@ -53,3 +56,6 @@ tests/ref 
__pycache__/

*.py[cod]

*$py.class



#history

.history/

.gitlab-ci.yml

+307 −114

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+29 −8
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ if(WMOPS) 
  add_definitions("-DWMOPS=1")

endif()



if(DEC_TO_REND_FLOAT_DUMP)

  add_compile_definitions(DEC_TO_REND_FLOAT_DUMP)

endif()



project(stereo-evs)

set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer
@@ -118,6 +121,7 @@ include_directories( 
  lib_debug

  lib_dec

  lib_enc

  lib_rend

  lib_util

)
@@ -131,21 +135,35 @@ endif() 
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)



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)



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.



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

target_link_libraries(lib_dec lib_com lib_rend lib_debug)



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

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

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



file(GLOB unitTestCRendSrcs "scripts/ivas_pytests/tests/unit_tests/crend/*.c")

file(GLOB unitTestCRendHeaders "scripts/ivas_pytests/tests/unit_tests/crend/*.h")

add_executable(IVAS_crend_unit_test ${unitTestCRendSrcs} ${unitTestCRendHeaders})

target_link_libraries(IVAS_crend_unit_test lib_rend lib_dec lib_util lib_com lib_debug)



add_executable(renderer_standalone "scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c")

target_link_libraries(renderer_standalone lib_rend lib_dec lib_util lib_com lib_debug)



add_executable(IVAS_cod apps/encoder.c)

target_link_libraries(IVAS_cod lib_enc lib_util)

if(WIN32)
@@ -158,11 +176,14 @@ if(WIN32) 
  target_link_libraries(IVAS_dec Ws2_32)

endif()



if(${IVAS_BUILD_PRERENDERER})

  add_executable(IVAS_prerenderer

    scripts/prerenderer/prerenderer.c

    ${libEncSrcs}

    ${libDecSrcs}

  )

  target_link_libraries(IVAS_prerenderer lib_com lib_dec lib_debug lib_util)

add_executable(IVAS_rend apps/renderer.c)

target_link_libraries(IVAS_rend lib_rend 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_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 IVAS_crend_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_crend_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/ivas_pytests/tests/unit_tests/crend/")

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

endif()

Makefile

+23 −11

File changed.

Preview size limit exceeded, changes collapsed.

Workspace_msvc/Workspace_msvc.sln

+22 −0

File changed.

Preview size limit exceeded, changes collapsed.