Merged with main (daa9dcfc) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -72,3 +72,15 @@ Externals/

	# coan output files that are created when cleaning out switches		# coan output files that are created when cleaning out switches
	coan_out_*		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

+39 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,7 @@ variables:
	LTV_DIR: "/usr/local/ltv"		LTV_DIR: "/usr/local/ltv"
	BUILD_OUTPUT: "build_output.txt"		BUILD_OUTPUT: "build_output.txt"
	EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"		EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
			EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"
	SANITIZER_TESTS: "CLANG1 CLANG2"		SANITIZER_TESTS: "CLANG1 CLANG2"
	OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"		OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"
	OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"		OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"
	@@ -12,8 +13,6 @@ variables:

	default:		default:
	interruptible: true # Make all jobs by default interruptible		interruptible: true # Make all jobs by default interruptible
	artifacts:
	expire_in: 2 weeks

	# This sets when pipelines are created. Jobs have more specific rules to restrict them.		# This sets when pipelines are created. Jobs have more specific rules to restrict them.
	workflow:		workflow:
	@@ -314,7 +313,7 @@ codec-smoke-test:
	extends:		extends:
	- .test-job-linux-needs-testv-dir		- .test-job-linux-needs-testv-dir
	- .rules-merge-request		- .rules-merge-request
	timeout: "5 minutes"		timeout: "10 minutes"
	stage: test		stage: test
	needs: ["build-codec-linux-cmake"]		needs: ["build-codec-linux-cmake"]
	script:		script:
	@@ -327,6 +326,7 @@ codec-smoke-test:
	- if cat smoke_test_output_hrtf.txt \| grep -c "failed"; then echo "Smoke test with external hrtf files 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:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
			expire_in: 1 week
	paths:		paths:
	- smoke_test_output.txt		- smoke_test_output.txt
	- smoke_test_output_plc.txt		- smoke_test_output_plc.txt
	@@ -351,6 +351,7 @@ codec-msan:
	- if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang memory-sanitizer"; exit 1; fi		- if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang memory-sanitizer"; exit 1; fi
	artifacts:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
			expire_in: 1 week
	paths:		paths:
	- scripts/ref/logs/		- scripts/ref/logs/
	- test_output.txt		- test_output.txt
	@@ -373,6 +374,7 @@ codec-asan:
	- if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang address-sanitizer"; exit 1; fi		- if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang address-sanitizer"; exit 1; fi
	artifacts:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
			expire_in: 1 week
	paths:		paths:
	- scripts/ref/logs/		- scripts/ref/logs/
	- test_output.txt		- test_output.txt
	@@ -390,6 +392,7 @@ renderer-smoke-test:
	- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
	artifacts:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
			expire_in: 1 week
	when: always		when: always
	paths:		paths:
	- report-junit.xml		- report-junit.xml
	@@ -413,6 +416,7 @@ renderer-asan:

	artifacts:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
			expire_in: 1 week
	when: always		when: always
	paths:		paths:
	- report-junit.xml		- report-junit.xml
	@@ -436,6 +440,7 @@ renderer-msan:

	artifacts:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
			expire_in: 1 week
	when: always		when: always
	paths:		paths:
	- report-junit.xml		- report-junit.xml
	@@ -489,6 +494,7 @@ renderer-pytest-on-merge-request:
	- 123		- 123
	artifacts:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
			expire_in: 2 week
	when: always		when: always
	paths:		paths:
	- report-junit.xml		- report-junit.xml
	@@ -539,6 +545,7 @@ ivas-pytest-on-merge-request:
	- 123		- 123
	artifacts:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
			expire_in: 2 week
	when: always		when: always
	paths:		paths:
	- report-junit.xml		- report-junit.xml
	@@ -585,6 +592,7 @@ evs-pytest-on-merge-request:
	- 123		- 123
	artifacts:		artifacts:
	name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
			expire_in: 2 week
	when: always		when: always
	paths:		paths:
	- report-junit-evs.xml		- report-junit-evs.xml
	@@ -643,6 +651,7 @@ clang-format-check:

	- exit $format_problems		- exit $format_problems
	artifacts:		artifacts:
			expire_in: 2 days
	paths:		paths:
	- tmp-formatting-fix/		- tmp-formatting-fix/
	when: on_failure		when: on_failure
	@@ -653,6 +662,30 @@ clang-format-check:
	# Test jobs for main branch		# Test jobs for main branch
	# ---------------------------------------------------------------		# ---------------------------------------------------------------

			# check bitexactness to EVS windows binaries
			be-2-evs-windows:
			extends:
			- .rules-main-push
			tags:
			- ivas-windows
			stage: test
			needs: ["build-codec-windows-msbuild"]
			timeout: "20 minutes" # To be revisited
			script:
			- *print-common-info-windows

			- $winoutdata = $null
			- MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Release \| tee -variable winoutdata
			- $winoutdata \| Out-File $BUILD_OUTPUT -Encoding Utf8

			# copy over to never change the testvector dir
			- cp -r $EVS_BE_WIN_TEST_DIR ./evs_be_win_test
			- cp IVAS_cod.exe ./evs_be_win_test/bin/IVAS_cod.exe
			- cp IVAS_dec.exe ./evs_be_win_test/bin/IVAS_dec.exe

			- cd evs_be_win_test
			- python ../ci/run_evs_be_win_test.py

	# check bitexactness to EVS		# check bitexactness to EVS
	be-2-evs-linux:		be-2-evs-linux:
	extends:		extends:
	@@ -751,6 +784,7 @@ codec-comparison-on-main-push:
	- 123		- 123
	artifacts:		artifacts:
	name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"		name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
			expire_in: 2 week
	when: always		when: always
	paths:		paths:
	- report-junit.xml		- report-junit.xml
	@@ -772,6 +806,7 @@ codec-comparison-on-main-push:
	- sanitizer_test_main		- sanitizer_test_main
	artifacts:		artifacts:
	name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"		name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"
			expire_in: 1 week
	when: always		when: always
	paths:		paths:
	- ep_015.g192		- ep_015.g192
	@@ -1035,6 +1070,7 @@ coverage-test-on-main-scheduled:
	stage: test		stage: test
	artifacts:		artifacts:
	name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"		name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
			expire_in: 1 week
	paths:		paths:
	- $CI_JOB_NAME-public		- $CI_JOB_NAME-public

Workspace_msvc/lib_com.vcxproj

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,7 @@
	</CustomBuildStep>		</CustomBuildStep>
	<ClCompile>		<ClCompile>
	<Optimization>Disabled</Optimization>		<Optimization>Disabled</Optimization>
	<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
	<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
	<ExceptionHandling />		<ExceptionHandling />
	<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>		<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

Workspace_msvc/lib_debug.vcxproj

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@
	</CustomBuildStep>		</CustomBuildStep>
	<ClCompile>		<ClCompile>
	<Optimization>Disabled</Optimization>		<Optimization>Disabled</Optimization>
	<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
	<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
	<MinimalRebuild>false</MinimalRebuild>		<MinimalRebuild>false</MinimalRebuild>
	<ExceptionHandling />		<ExceptionHandling />

Workspace_msvc/lib_dec.vcxproj

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,7 @@
	</Midl>		</Midl>
	<ClCompile>		<ClCompile>
	<Optimization>Disabled</Optimization>		<Optimization>Disabled</Optimization>
	<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
	<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
	<ExceptionHandling />		<ExceptionHandling />
	<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>		<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
	@@ -282,6 +282,7 @@
	<ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />		<ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />		<ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />		<ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />
			<ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />		<ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />		<ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />
	<ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />		<ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />
	@@ -290,6 +291,7 @@
	<ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />		<ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_mct_dec.c" />		<ClCompile Include="..\lib_dec\ivas_mct_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_mct_dec_mct.c" />		<ClCompile Include="..\lib_dec\ivas_mct_dec_mct.c" />
			<ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_mc_param_dec.c" />		<ClCompile Include="..\lib_dec\ivas_mc_param_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c" />		<ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c" />
	<ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />		<ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />