Merge remote-tracking branch 'remotes/origin/main' into... (bea683b3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+4 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		IVAS_cod
		IVAS_dec
		IVAS_rend
		ISAR_post_rend
		obj/
		*.a
		*.o
		@@ -16,6 +17,7 @@ build//
		IVAS_cod.exe
		IVAS_dec.exe
		IVAS_rend.exe
		ISAR_post_rend.exe
		*.user
		.vs/
		Debug_*/
		@@ -54,10 +56,12 @@ scripts/testv/stvOMASA_*.met
		scripts/testv/stvOMASA_*.csv
		scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav
		scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav
		scripts/testv/stvO*
		# default reference binary name
		IVAS_cod_ref*
		IVAS_dec_ref*
		IVAS_rend_ref*
		ISAR_post_rend_ref*

		# Python files that pop up when running scripts
		__pycache__/

.gitlab-ci.yml

+112 −36

Original line number	Diff line number	Diff line
		@@ -167,6 +167,12 @@ stages:
		- git pull
		- cd -

		.update-ltv-repo-win: &update-ltv-repo-win
		- Push-Location
		- cd $LTV_DIR_WIN
		- git pull
		- Pop-Location

		.enable-split-rendering: &enable-split-rendering
		# automatically enable #define SPLIT_REND_WITH_HEAD_ROT in options.h, handling both /**/-comment and //-comment
		- sed -i.bak -e "s/\/\[[:space:]]$#define[[:space:]]SPLIT_REND_WITH_HEAD_ROT$[[:space:]]\*\//\1/g" ./lib_com/options.h
		@@ -189,6 +195,11 @@ stages:
		- cp "$LTV_DIR"/*.met scripts/testv/
		- cp "$LTV_DIR"/*.csv scripts/testv/

		.copy-ltv-files-to-testv-dir-win: &copy-ltv-files-to-testv-dir-win
		- cp $LTV_DIR_WIN\*.wav scripts\testv
		- cp $LTV_DIR_WIN\*.met scripts\testv
		- cp $LTV_DIR_WIN\*.csv scripts\testv

		.activate-Werror-linux: &activate-Werror-linux
		- sed -i.bak "s/^# $CFLAGS += -Werror$/\1/" Makefile
		- sed -i.bak "s/# $set(CMAKE_C_FLAGS \"\${CMAKE_C_FLAGS} -Werror\")$/\1/" CMakeLists.txt
		@@ -379,6 +390,17 @@ branch-is-up-to-date-with-main-pre:
		- echo $commits_behind_count
		- if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, run 'git merge origin/main' to update."; exit 1; fi;

		check-self-test-names-pre:
		extends:
		- .rules-merge-request
		stage: prevalidate
		needs: []
		tags:
		- ivas-linux
		script:
		- python3 ci/check_self_test_names.py scripts/config/self_test.prm 135


		branch-is-up-to-date-with-main-post:
		extends:
		- .rules-merge-request
		@@ -420,7 +442,7 @@ build-codec-instrumented-linux:
		extends:
		- .build-job-linux
		- .rules-basis
		timeout: "7 minutes"
		timeout: "10 minutes"
		script:
		- *print-common-info
		- *activate-Werror-linux
		@@ -491,7 +513,6 @@ build-codec-windows-msbuild:
		script:
		- *print-common-info-windows
		- *activate-WX-windows
		- python .\scripts\strip_split_rendering.py
		- MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug

		# ---------------------------------------------------------------
		@@ -789,6 +810,18 @@ split-rendering-smoke-test:
		junit:
		- report-junit.xml

		lc3-wrapper-unit-test:
		extends:
		- .test-job-linux
		- .rules-merge-request
		needs: ["build-codec-linux-cmake"]
		stage: test
		script:
		- *enable-split-rendering
		- cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		- scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test

		# compare split-rendering bitexactness between target and source branch
		split-rendering-pytest-on-merge-request:
		extends:
		@@ -1337,45 +1370,46 @@ ivas-conformance:
		tags:
		- ivas-windows
		stage: test
		timeout: "60 minutes"
		timeout: "90 minutes"
		rules:
		- if: ($CI_PIPELINE_SOURCE == 'web' \|\| $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
		- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		allow_failure:
		exit_codes:
		- 123
		script:
		- *print-common-info-windows
		# Prepare reference exec, use tests and scripts from reference
		- $source_branch_commit_sha = $(git rev-parse HEAD)
		- git checkout main # This should be set to a relevant reference
		- git pull # Ensure to get the latest version
		- python .\scripts\strip_split_rendering.py
		- MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug
		- cp -force IVAS_cod.exe IVAS_cod_ref.exe
		- cp -force IVAS_dec.exe IVAS_dec_ref.exe
		- cp -force IVAS_rend.exe IVAS_rend_ref.exe
		- git restore .
		- git checkout $source_branch_commit_sha

		# Reference creation
		- python tests/create_short_testvectors.py
		- python scripts/prepare_combined_format_inputs.py
		- python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files
		- python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
		- python -m pytest tests/renderer/test_renderer.py --create_ref --keep_files
		- $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer/test_renderer.py", "tests/split_rendering/test_split_rendering.py"
		- python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
		- python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

		# Output creation
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		- python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		- python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

		# Copy input data and output ref data
		- if (Test-Path testvec) {rm -r -force testvec}
		- if (Test-Path TMP_DEC) {rm -r -force TMP_DEC}
		- if (Test-Path TMP_ENC) {rm -r -force TMP_ENC}
		- if (Test-Path TMP_JBM) {rm -r -force TMP_JBM}
		- if (Test-Path TMP_REND) {rm -r -force TMP_REND}
		- if (Test-Path TMP_ISAR_POST_REND) {rm -r -force TMP_ISAR_POST_REND}
		- if (Test-Path TMP_DEC_ISAR) {rm -r -force TMP_DEC_ISAR}
		- mkdir testvec
		- mkdir testvec/binauralRenderer_interface
		- mkdir testvec/testv
		- mkdir testvec/testv/renderer
		- mkdir testvec/testv/split_rendering
		- mkdir testvec/bin
		- cp -r -force -ErrorAction Ignore scripts/testv/* testvec/testv
		- cp -force -ErrorAction Ignore scripts/testv/* testvec/testv
		- cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
		- cp -r -force -ErrorAction Ignore scripts/switchPaths testvec
		- cp -r -force -ErrorAction Ignore scripts/trajectories testvec
		@@ -1383,14 +1417,26 @@ ivas-conformance:
		- cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref
		- cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref
		- cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref
		- cp -r -force -ErrorAction Ignore tests/split_rendering/cut testvec/testv/split_rendering/ref
		- cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs
		- cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns

		# Remove redundant files
		- python scripts/cleanup_26252.py

		# Copy test script files
		- cp -r -force -ErrorAction Ignore tests/conformance-test testvec/
		- cp Readme_IVAS_dec.txt testvec
		- cp Readme_IVAS_enc.txt testvec
		- cp Readme_IVAS_rend.txt testvec
		- cp Readme_IVAS_JBM_dec.txt testvec
		- cp Readme_IVAS_ISAR_dec.txt testvec
		- cp Readme_IVAS_ISAR_post_rend.txt testvec
		- cp IVAS_cod.exe testvec/bin
		- cp IVAS_dec.exe testvec/bin
		- cp IVAS_rend.exe testvec/bin
		- cp ISAR_post_rend.exe testvec/bin


		# Test run generated scripts in testvec
		- cd testvec
		@@ -1409,6 +1455,8 @@ ivas-conformance:
		- Readme_IVAS_enc.txt
		- Readme_IVAS_rend.txt
		- Readme_IVAS_JBM_dec.txt
		- Readme_IVAS_ISAR_dec.txt
		- Readme_IVAS_ISAR_post_rend.txt
		expose_as: "Draft IVAS conformance"
		reports:
		junit: report-junit.xml
		@@ -1417,7 +1465,7 @@ ivas-conformance-linux:
		tags:
		- ivas-linux
		stage: test
		timeout: "60 minutes"
		timeout: "90 minutes"
		rules:
		- if: ($CI_PIPELINE_SOURCE == 'web' \|\| $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'
		allow_failure:
		@@ -1425,26 +1473,20 @@ ivas-conformance-linux:
		- 123
		script:
		- *print-common-info
		# Prepare reference exec, use tests and scripts from reference
		- source_branch_commit_sha=$(git rev-parse HEAD)
		- git checkout main # This should be set to a relevant reference

		- make -j
		- cp IVAS_cod IVAS_cod_ref
		- cp IVAS_dec IVAS_dec_ref
		- cp IVAS_rend IVAS_rend_ref
		- git restore .
		- git checkout $source_branch_commit_sha

		# Reference creation
		- python3 tests/create_short_testvectors.py
		- python3 scripts/prepare_combined_format_inputs.py
		- python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files
		- python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
		- python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files
		- TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py"
		- python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
		- python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

		# Output creation
		- python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		- python3 -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		- python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

		# Copy input data and output ref data
		@@ -1453,6 +1495,7 @@ ivas-conformance-linux:
		- mkdir testvec/binauralRenderer_interface
		- mkdir testvec/testv
		- mkdir testvec/testv/renderer
		- mkdir testvec/testv/split_rendering
		- mkdir testvec/bin
		- cp -r scripts/testv/* testvec/testv
		- cp -r scripts/ls_layouts testvec
		@@ -1462,32 +1505,65 @@ ivas-conformance-linux:
		- cp -r tests/ref testvec/testv/ref
		- cp -r tests/dut/* testvec/testv/ref
		- cp -r tests/renderer/cut testvec/testv/renderer/ref
		- cp -r tests/split_rendering/cut testvec/testv/split_rendering/ref
		- cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs
		- cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns

		# Remove redundant files
		- python3 scripts/cleanup_26252.py

		# Copy test script files
		- cp -r tests/conformance-test testvec/
		- cp Readme_IVAS_dec.txt testvec
		- cp Readme_IVAS_enc.txt testvec
		- cp Readme_IVAS_rend.txt testvec
		- cp Readme_IVAS_JBM_dec.txt testvec
		- cp Readme_IVAS_ISAR_dec.txt testvec
		- cp Readme_IVAS_ISAR_post_rend.txt testvec

		# Create GCOV execs for coverage analysis
		- make clean
		- make GCOV=1 -j

		- cp IVAS_cod testvec/bin
		- cp IVAS_dec testvec/bin
		- cp IVAS_rend testvec/bin
		- cp ISAR_post_rend testvec/bin

		# Test run generated scripts in testvec
		- cd testvec
		- python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
		- exit_code=0
		- python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html \|\| exit_code=$?
		- mv report.html ..
		- mv report-junit.xml ..

		# Collect coverage
		- cd -
		- lcov -c -d obj -o coverage.info
		- lcov -r coverage.info "apps" -o coverage.info
		- lcov -r coverage.info "lib_util" -o coverage.info
		- commit_sha=$(git rev-parse HEAD)
		- genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"

		# Check for failures
		- if [ $exit_code -eq 1 ]; then echo "Test failures encountered"; exit $EXIT_CODE_FAIL; fi

		artifacts:
		name: "ivas-conformance-linux-$CI_COMMIT_SHORT_SHA"
		expire_in: 1 week
		when: always
		paths:
		- report_cmd.html
		- report-junit.xml
		- report.html
		- Readme_IVAS_dec.txt
		- Readme_IVAS_enc.txt
		- Readme_IVAS_rend.txt
		- Readme_IVAS_JBM_dec.txt
		- Readme_IVAS_ISAR_dec.txt
		- Readme_IVAS_ISAR_post_rend.txt
		- coverage.info
		- coverage
		expose_as: "Draft IVAS conformance -- Linux"
		reports:
		junit: report-junit.xml
		@@ -1574,7 +1650,7 @@ ltv-msan:
		- .sanitizer-selftest-ltv
		rules:
		- if: $SANITIZER_SCHEDULE_E
		timeout: 2 hour
		timeout: 3 hour
		tags:
		- ivas-linux-fast
		before_script:
		@@ -1590,10 +1666,10 @@ ltv-asan:
		rules:
		- if: $SANITIZER_SCHEDULE_E
		when: delayed
		start_in: 2 hours
		start_in: 3 hours
		tags:
		- ivas-linux-fast
		timeout: 2 hour
		timeout: 3 hour
		before_script:
		- CLANG_NUM=2
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS
		@@ -1607,10 +1683,10 @@ ltv-usan:
		rules:
		- if: $SANITIZER_SCHEDULE_E
		when: delayed
		start_in: 3 hours
		start_in: 6 hours
		tags:
		- ivas-linux-fast
		timeout: 2 hour
		timeout: 3 hour
		before_script:
		- CLANG_NUM=3
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS

CMakeLists.txt

+31 −61

Original line number	Diff line number	Diff line
		@@ -27,14 +27,12 @@
		# # or build on command line, e.g.:
		# cmake --build . --config Debug
		# cmake --build . --config Release
		#
		# INCLUDE_SPLIT is not set by default. If split rendering is used, then add -D INCLUDE_SPLIT=1 to the build command


		cmake_minimum_required(VERSION 3.1)

		set(CMAKE_C_STANDARD 99)


		# configuration options for UNIX
		if(UNIX)
		set(TARGET_PLATFORM "" CACHE STRING "i686 / x86_64")
		@@ -115,11 +113,6 @@ elseif(WIN32)
		-D_CRT_SECURE_NO_WARNINGS
		/MP
		)
		if(NOT INCLUDE_SPLIT)
		add_compile_options("/W4")
		# to be uncommented in CI
		# add_compile_options("/WX")
		endif()
		endif()

		# configuration options for all platforms
		@@ -138,87 +131,61 @@ add_library(lib_com ${libComSrcs} ${libComHeaders})
		if(UNIX)
		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)
		if(INCLUDE_SPLIT)
		target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug lib_isar)
		target_include_directories(lib_com PRIVATE lib_lc3plus)
		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)
		target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend)
		target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend lib_isar)

		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)
		if(INCLUDE_SPLIT)
		target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend lib_isar)
		target_include_directories(lib_enc PRIVATE lib_lc3plus)
		endif()

		if(INCLUDE_SPLIT)
		file(GLOB libLC3plusSrcs "lib_lc3plus/*.c")
		file(GLOB libLC3plusHeaders "lib_lc3plus/*.h")
		add_library(lib_lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})
		target_include_directories(lib_lc3plus PUBLIC lib_lc3plus)
		target_link_libraries(lib_lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly
		if(WMOPS)
		target_link_libraries(lib_lc3plus lib_debug)
		endif()
		endif()
		target_include_directories(lib_lc3plus PUBLIC lib_lc3plus PRIVATE lib_com lib_debug)

		file(GLOB libRendSrcs "lib_rend/*.c")
		file(GLOB libRendHeaders "lib_rend/*.h")
		if(NOT INCLUDE_SPLIT)
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.lc3plus.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_cldfb_codec.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.splitRend.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.splitrenderer.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_lcld.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_Pred.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_RMSEnv.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_PerceptualModel.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_lcld_rom_tables.*\.c$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.lc3plus.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.splitRend.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_cldfb_codec.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_lcld_rom_tables.*\.h$")
		endif()

		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.
		if(INCLUDE_SPLIT)
		target_link_libraries(lib_rend lib_lc3plus)
		endif()
		target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc)
		target_link_libraries(lib_rend lib_lc3plus lib_isar)
		target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc lib_isar)


		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)
		target_link_libraries(lib_dec lib_com lib_rend lib_debug lib_isar)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)

		file(GLOB libUtilSrcs "lib_util/*.c")
		file(GLOB libUtilHeaders "lib_util/*.h")
		if(NOT INCLUDE_SPLIT)
		list(FILTER libUtilSrcs EXCLUDE REGEX ".lib_util\/.split_rend.*\.c$")
		endif()
		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)
		if(INCLUDE_SPLIT)
		target_include_directories(lib_util PRIVATE lib_lc3plus)
		endif()
		target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)

		if(INCLUDE_SPLIT)
		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)
		endif()
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)
		endif()

		file(GLOB libISARSrcs "lib_isar/*.c")
		file(GLOB libISARHeaders "lib_isar/*.h")

		add_library(lib_isar ${libISARSrcs} ${libISARHeaders})
		target_link_libraries(lib_isar lib_com lib_debug lib_lc3plus) # Todo refactor: This dependency on lib_dec should be removed.
		target_include_directories(lib_isar PUBLIC lib_isar PRIVATE lib_enc lib_dec lib_rend)


		add_executable(IVAS_cod apps/encoder.c)
		target_link_libraries(IVAS_cod lib_enc lib_util)
		if(WIN32)
		@@ -232,20 +199,23 @@ if(WIN32)
		endif()

		add_executable(IVAS_rend apps/renderer.c)
		target_link_libraries(IVAS_rend lib_rend lib_util)
		target_link_libraries(IVAS_rend lib_rend lib_util lib_isar)
		target_include_directories(IVAS_rend PRIVATE lib_enc)

		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)

		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(INCLUDE_SPLIT)
		add_custom_command(TARGET ISAR_post_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ISAR_post_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()
		endif()

		# Allow creating packages for CMake install
		install(TARGETS lib_enc lib_dec lib_rend lib_com lib_util ARCHIVE DESTINATION lib)

Makefile

+34 −37

File changed.

Preview size limit exceeded, changes collapsed.

Workspace_msvc/Workspace_msvc.sln

+17 −1

Original line number	Diff line number	Diff line
		@@ -20,13 +20,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcxproj", "{12B4C8A5-1E06-4E30-B443-D1F916F52B47}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LC3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_lc3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"
		EndProject
		Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{51160D4C-55C9-4C16-A792-D94507225746}"
		ProjectSection(SolutionItems) = preProject
		..\.clang-format = ..\.clang-format
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_isar", "lib_isar.vcxproj", "{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isar_post_rend", "isar_post_rend.vcxproj", "{12374ADC-0E5C-4FDD-B903-71D572413831}"
		EndProject
		Global
		GlobalSection(SolutionConfigurationPlatforms) = preSolution
		Debug\|Win32 = Debug\|Win32
		@@ -95,6 +99,18 @@ Global
		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release\|Win32.ActiveCfg = Release\|Win32
		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release\|Win32.Build.0 = Release\|Win32
		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release\|x64.ActiveCfg = Release\|Win32
		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug\|Win32.Build.0 = Debug\|Win32
		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug\|x64.ActiveCfg = Debug\|Win32
		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release\|Win32.ActiveCfg = Release\|Win32
		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release\|Win32.Build.0 = Release\|Win32
		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release\|x64.ActiveCfg = Release\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug\|Win32.Build.0 = Debug\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug\|x64.ActiveCfg = Debug\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|Win32.ActiveCfg = Release\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|Win32.Build.0 = Release\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|x64.ActiveCfg = Release\|Win32
		EndGlobalSection
		GlobalSection(SolutionProperties) = preSolution
		HideSolutionNode = FALSE