Merge branch 'main' into 258-revise-visual-studio-release-build-configuration (01014b40) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitattributes

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,5 +29,6 @@
		*.mat filter=lfs diff=lfs merge=lfs -text
		*.met filter=lfs diff=lfs merge=lfs -text
		*.pcm filter=lfs diff=lfs merge=lfs -text
		*.sofa filter=lfs diff=lfs merge=lfs -text
		*.wav filter=lfs diff=lfs merge=lfs -text
		*.zip filter=lfs diff=lfs merge=lfs -text

.gitignore

+6 −0

Original line number	Diff line number	Diff line
		@@ -65,3 +65,9 @@ __pycache__/

		#history
		.history/

		#externals
		Externals/

		# coan output files that are created when cleaning out switches
		coan_out_*

.gitlab-ci.yml

+61 −70

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@ variables:
		EXIT_CODE_NON_BE: 123
		EXIT_CODE_FAIL: 1

		default:
		interruptible: true # Make all jobs by default interruptible

		# This sets when pipelines are created. Jobs have more specific rules to restrict them.
		workflow:
		@@ -23,6 +25,7 @@ workflow:
		- if: $CI_PIPELINE_SOURCE == 'web' # for testing

		stages:
		- .pre
		- maintenance
		- build
		- test
		@@ -147,7 +150,7 @@ stages:

		.build-job-linux:
		stage: build
		timeout: "2 minutes"
		timeout: "4 minutes"
		tags:
		- ivas-linux

		@@ -168,6 +171,31 @@ stages:
		- 123



		# ---------------------------------------------------------------
		# .pre jobs for setting up things
		# ---------------------------------------------------------------

		# See: https://gitlab.com/gitlab-org/gitlab/-/issues/194023
		# Solution to make main branch pipelines uninterruptible while all other
		# pipelines can be interrupted by default. This works because all jobs
		# after uninterruptible jobs will be uninterruptible. Resource group
		# setting avoids rare case where two fast merges could still interrupt
		# pipeline. This should be revisited if there are updates to Gitlab.
		uninterruptible:
		stage: .pre
		interruptible: false
		resource_group: uninterruptible
		script:
		- echo "$CI_COMMIT_BRANCH is uninterruptible"
		rules:
		- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		when: always
		tags:
		- ivas-linux



		# ---------------------------------------------------------------
		# Validation jobs
		# ---------------------------------------------------------------
		@@ -201,26 +229,6 @@ build-codec-linux-make:
		# 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-unittests-linux:
		extends:
		- .build-job-with-check-for-warnings
		- .rules-basis
		script:
		- *print-common-info
		- make unittests -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-td-object-renderer-standalone-linux:
		extends:
		- .build-job-with-check-for-warnings
		- .rules-basis
		script:
		- *print-common-info
		- make -C scripts/td_object_renderer/object_renderer_standalone -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-linux-cmake:
		extends:
		- .build-job-with-check-for-warnings
		@@ -270,7 +278,8 @@ codec-smoke-test:
		### analyze for failures
		- if cat smoke_test_output.txt \| grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi
		- if cat smoke_test_output_plc.txt \| grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi
		- if cat smoke_test_output_jbm_noEXT.txt \| grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi
		- if cat smoke_test_output_jbm_noEXT.txt \| grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi
		- if cat smoke_test_output_hrtf.txt \| grep -c "failed"; then echo "Smoke test with external hrtf files failed"; exit 1; fi
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		paths:
		@@ -278,10 +287,11 @@ codec-smoke-test:
		- smoke_test_output.txt
		- smoke_test_output_plc.txt
		- smoke_test_output_jbm_noEXT.txt
		- smoke_test_output_hrtf.txt
		expose_as: "Smoke test results"

		# code selftest testvectors with memory-sanitizer binaries
		msan-on-merge-request-linux:
		codec-msan:
		extends:
		- .test-job-linux
		- .rules-merge-request
		@@ -300,10 +310,10 @@ msan-on-merge-request-linux:
		paths:
		- scripts/ref/logs/
		- test_output.txt
		expose_as: "Msan selftest results"
		expose_as: "msan selftest results"

		# code selftest testvectors with address-sanitizer binaries
		asan-on-merge-request-linux:
		codec-asan:
		extends:
		- .test-job-linux
		- .rules-merge-request
		@@ -322,10 +332,10 @@ asan-on-merge-request-linux:
		paths:
		- scripts/ref/logs/
		- test_output.txt
		expose_as: "Asan selftest results"
		expose_as: "asan selftest results"

		# test external renderer executable
		external-renderer-make-pytest:
		# test renderer executable
		renderer-smoke-test:
		extends:
		- .test-job-linux
		- .rules-merge-request
		@@ -333,21 +343,19 @@ external-renderer-make-pytest:
		stage: test
		script:
		- make -j IVAS_rend
		- make -j unittests
		- make -j --directory scripts/td_object_renderer/object_renderer_standalone
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		when: always
		paths:
		- report-junit.xml
		expose_as: "external renderer make pytest results"
		expose_as: "renderer make pytest results"
		reports:
		junit:
		- report-junit.xml

		# test external renderer executable with cmake + asan
		external-renderer-cmake-asan-pytest:
		# test renderer executable with cmake + asan
		renderer-asan:
		extends:
		- .test-job-linux
		- .rules-merge-request
		@@ -364,13 +372,13 @@ external-renderer-cmake-asan-pytest:
		when: always
		paths:
		- report-junit.xml
		expose_as: "external renderer cmake asan pytest results"
		expose_as: "renderer asan pytest results"
		reports:
		junit:
		- report-junit.xml

		# test external renderer executable with cmake + msan
		external-renderer-cmake-msan-pytest:
		# test renderer executable with cmake + msan
		renderer-msan:
		extends:
		- .test-job-linux
		- .rules-merge-request
		@@ -387,35 +395,13 @@ external-renderer-cmake-msan-pytest:
		when: always
		paths:
		- report-junit.xml
		expose_as: "external renderer cmake msan pytest results"
		reports:
		junit:
		- report-junit.xml

		# test external renderer executable with cmake vs decoder renderer
		# TODO @tmu @knj @sgi -> converted to script, decide whether to re-enable later
		.external-renderer-cmake-vs-decoder-pytest:
		extends:
		- .test-job-linux
		- .rules-merge-request
		needs: ["build-codec-linux-cmake"]
		stage: test
		script:
		- cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true -DDEC_TO_REND_FLOAT_DUMP=true
		- cmake --build cmake-build -- -j
		- python3 -m pytest -q -n 1 -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_vs_decoder.py
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		when: always
		paths:
		- report-junit.xml
		expose_as: "external renderer cmake vs decoder results"
		expose_as: "renderer msan pytest results"
		reports:
		junit:
		- report-junit.xml

		# compare external renderer bitexactness between target and source branch
		external-renderer-pytest-on-merge-request:
		# compare renderer bitexactness between target and source branch
		renderer-pytest-on-merge-request:
		extends:
		- .test-job-linux
		- .rules-merge-request
		@@ -463,7 +449,7 @@ external-renderer-pytest-on-merge-request:
		paths:
		- report-junit.xml
		- report.html
		expose_as: "pytest external renderer results"
		expose_as: "pytest renderer results"
		reports:
		junit:
		- report-junit.xml
		@@ -839,7 +825,7 @@ sanitizer-test-masa:
		.sanitizer-test-schedule-B:
		extends:
		- .sanitizer-test-template
		timeout: 3 hours
		timeout: 4 hours

		sanitizer-test-mc-5_1:
		extends: .sanitizer-test-schedule-B
		@@ -854,7 +840,7 @@ sanitizer-test-mc-5_1_2:
		rules:
		- if: $SANITIZER_SCHEDULE_B
		when: delayed
		start_in: 3 hours
		start_in: 4 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py 5_1_2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
		@@ -864,7 +850,7 @@ sanitizer-test-mc-5_1_4:
		rules:
		- if: $SANITIZER_SCHEDULE_B
		when: delayed
		start_in: 6 hours
		start_in: 8 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py 5_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
		@@ -874,7 +860,7 @@ sanitizer-test-mc-7_1:
		rules:
		- if: $SANITIZER_SCHEDULE_B
		when: delayed
		start_in: 9 hours
		start_in: 12 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py 7_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
		@@ -884,7 +870,7 @@ sanitizer-test-mc-7_1_4:
		rules:
		- if: $SANITIZER_SCHEDULE_B
		when: delayed
		start_in: 12 hours
		start_in: 16 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py 7_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
		@@ -928,12 +914,17 @@ coverage-test-on-main-scheduled:
		script:
		- *print-common-info
		- 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 -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		- python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		- python3 -m pytest tests/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
		- 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
		- lcov -c -d obj -o coverage.info
		- genhtml coverage.info -o coverage
		- commit_sha=$(git rev-parse HEAD)
		- genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"
		artifacts:
		name: "main-coverage-sha-$CI_COMMIT_SHORT_SHA"
		when: always
		@@ -969,8 +960,8 @@ coverage-test-on-main-scheduled:
		- mv -f wmops/log__all.txt wmops/.js ${public_dir}/
		# move logfiles for links
		- mkdir $public_dir/logs
		# first move logs for "native" sampling rate
		- log_files=$(cat $public_dir/graphs_wmops_flc.js \| grep logFile \| sed "s/.$wmops_newsletter_.\.csv$.*/\1/g")
		# first move logs
		- log_files=$(cat $public_dir/graphs.js \| grep logFile \| sed "s/.$wmops_newsletter_.\.csv$./\1/g")
		- echo $log_files
		- ls wmops/logs
		- for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done

CMakeLists.txt

+0 −14

Original line number	Diff line number	Diff line
		@@ -108,10 +108,6 @@ 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
		include(CTest)
		@@ -156,14 +152,6 @@ 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)
		@@ -184,8 +172,6 @@ if(COPY_EXECUTABLES_FROM_BUILD_DIR)
		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()

		# Allow creating packages for CMake install

LICENSE.md

+1 −1

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		(C) 2022-2023 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