Merge branch 'main' into 705-renderer-configuration-outputs-false-warning-for-blank-lines (f540d38a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+83 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ variables:
		options:
		- 'default'
		- 'test-be-release'
		- 'test-long-self-test'


		default:
		@@ -46,6 +47,9 @@ workflow:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-be-release'
		variables:
		IVAS_PIPELINE_NAME: 'Test BE to release pipeline: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'
		variables:
		IVAS_PIPELINE_NAME: 'Test long self-test against main pipeline: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'trigger'

		stages:
		@@ -174,6 +178,8 @@ stages:
		when: never
		- if: $MANUAL_PIPELINE_TYPE == 'test-be-release' # Skip all the normal jobs when testing manually against release codec
		when: never
		- if: $MANUAL_PIPELINE_TYPE == 'test-long-self-test' # Skip all the normal jobs when testing manually against release codec
		when: never
		- when: on_success

		.rules-merge-request:
		@@ -385,6 +391,7 @@ codec-smoke-test:
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 1 week
		when: always
		paths:
		- smoke_test_output.txt
		- smoke_test_output_plc.txt
		@@ -409,6 +416,7 @@ codec-msan:
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 1 week
		when: always
		paths:
		- scripts/ref/logs/
		- test_output.txt
		@@ -431,6 +439,7 @@ codec-asan:
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 1 week
		when: always
		paths:
		- scripts/ref/logs/
		- test_output.txt
		@@ -454,6 +463,7 @@ codec-usan:
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 1 week
		when: always
		paths:
		- scripts/ref/logs/
		expose_as: "usan selftest results"
		@@ -859,7 +869,7 @@ clang-format-check:
		expire_in: 1 day
		paths:
		- tmp-formatting-fix/
		when: on_failure
		when: always
		name: "$ARTIFACT_BASE_NAME"
		expose_as: "formatting patch"

		@@ -896,7 +906,7 @@ check-first-frame-is-sid:
		artifacts:
		paths:
		- out/logs
		when: on_failure
		when: always
		name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--sidstart"
		expose_as: "logs-sidstart"
		expire_in: "5 days"
		@@ -1087,6 +1097,77 @@ test-be-to-release:
		- logs/
		expose_as: "test-be-to-release results"


		test-long-self-test:
		tags:
		- ivas-linux-fast
		stage: compare
		resource_group: ivas-long-self-test-resource
		timeout: "50 minutes"
		rules:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'
		allow_failure:
		exit_codes:
		- 123
		script:
		- *print-common-info
		- *update-ltv-repo

		### build branch binaries
		- cmake . -Bbuild-test
		- cmake --build build-test -- -j
		- mv build-test/IVAS_cod ./IVAS_cod
		- mv build-test/IVAS_dec ./IVAS_dec

		### store the current commit hash
		- source_branch_commit_sha=$(git rev-parse HEAD)

		### switch to main
		- git checkout main

		### build main (ref) binaries
		- cmake . -Bbuild-ref
		- cmake --build build-ref -- -j
		- mv build-ref/IVAS_cod ./IVAS_cod_ref
		- mv build-ref/IVAS_dec ./IVAS_dec_ref

		### Switch back to branch, this could probably be removed later
		- git checkout $source_branch_commit_sha

		### prepare pytest

		# Copy test vectors from LTV to TESTV
		- cp "$LTV_DIR"/*.wav scripts/testv/
		- cp "$LTV_DIR"/*.met scripts/testv/
		- cp "$LTV_DIR"/*.csv scripts/testv/

		# create references
		- exit_code_ref=0
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --update_ref 1 -m create_ref --param_file scripts/config/self_test_ltv.prm \|\| exit_code_ref=$?

		### run pytest self-test using long test vectors
		- exit_code=0
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --param_file scripts/config/self_test_ltv.prm --html=report-ltv.html --self-contained-html --junit-xml=report-junit-ltv.xml \|\| exit_code=$?
		- zero_errors=$(cat report-junit-ltv.xml \| grep -c 'errors="0"') \|\| true

		- if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi
		- if [ $exit_code -eq 1 ]; then echo "Non-bitexact cases encountered!"; exit $EXIT_CODE_NON_BE; fi
		- exit 0


		artifacts:
		name: "test-long-self-test--sha-$CI_COMMIT_SHORT_SHA--results"
		when: always
		expire_in: 4 mos
		paths:
		- report-junit-ltv.xml
		- report-ltv.html
		expose_as: "test-long-self-test results"
		reports:
		junit:
		- report-junit-ltv.xml


		# ---------------------------------------------------------------
		# Scheduled jobs on main
		# ---------------------------------------------------------------

.gitlab/merge_request_templates/default.md

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--- Basic information that is useful -->
		- Related issues:
		- Requested reviewers:

		### Reason why this change is needed

		* This may be a direct copy from the issue.

		### Description of the change

		* Describe what is done.

		### Affected operating points

		* Describe here as well as possible what operating points are affected and how
		* In minimum, there should be a status for bitstream compatibility and output bit exactness
		* For bitstream compatibility, the following levels are helpful for describing encoder
		1. Produced bitstream is BE compared to previous state.
		2. Produced bitstream is non-BE but it is fully backwards compatible for decoding. Decoded output may differ.
		3. Produced bitstream is non-BC. Old decoder cannot decode the produced bitstream correctly.
		* For output difference, use BE or non-BE. Additionally, amount of difference can be presented.


		<!--- By default, no labels are added as they often come from the issue. Add labels if there is no issue for this. -->

Workspace_msvc/lib_dec.vcxproj.filters

+2 −6

Original line number	Diff line number	Diff line
		@@ -439,9 +439,6 @@
		<ClCompile Include="..\lib_dec\lead_deindexing.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\lib_dec.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\lp_exc_d.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		@@ -520,6 +517,7 @@
		<ClCompile Include="..\lib_dec\waveadjust_fec_dec.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\lib_dec.c" />
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_dec\ivas_stat_dec.h">
		@@ -558,9 +556,7 @@
		<ClInclude Include="..\lib_dec\rom_dec.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\lib_dec.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\lib_dec.h" />
		</ItemGroup>
		<ItemGroup>
		<Filter Include="decoder_all_c">

Workspace_msvc/lib_enc.vcxproj.filters

+4 −2

Original line number	Diff line number	Diff line
		@@ -590,10 +590,12 @@
		<ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ivas_osba_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_omasa_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ivas_osba_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_enc\ivas_stat_enc.h">

apps/decoder.c

+28 −3

Original line number	Diff line number	Diff line
		@@ -494,11 +494,13 @@ int main(
		}
		#endif

		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig,
		arg.tsmEnabled, arg.enable5ms,
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.enable5ms,
		arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,
		#ifdef FIX_708_DPID_COMMAND_LINE
		arg.Opt_dpid_on,
		#endif
		#ifdef FIX_708_AEID_COMMAND_LINE
		arg.acousticEnvironmentId,
		#endif
		arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		{
		@@ -696,7 +698,11 @@ int main(
		goto cleanup;
		}
		}
		#ifdef FIX_708_AEID_COMMAND_LINE
		else
		#else
		else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )
		#endif
		{
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );
		goto cleanup;
		@@ -1069,8 +1075,11 @@ static bool parseCmdlIVAS_dec(
		arg->noBadFrameDelay = false;
		#endif
		#endif

		#ifdef FIX_708_AEID_COMMAND_LINE
		arg->acousticEnvironmentId = 65535;
		#else
		arg->acousticEnvironmentId = 0;
		#endif
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
		@@ -1079,6 +1088,7 @@ static bool parseCmdlIVAS_dec(
		arg->directivityPatternId[i] = 0;
		#endif
		}

		/-----------------------------------------------------------------
		* Initialization
		-----------------------------------------------------------------/
		@@ -1448,6 +1458,21 @@ static bool parseCmdlIVAS_dec(
		else if ( strcmp( argv_to_upper, "-AEID" ) == 0 )
		{
		++i;
		#ifdef FIX_708_AEID_COMMAND_LINE
		if ( argc - i <= 4 )
		{
		fprintf( stderr, "Error: Acoustic environment ID not specified!\n\n" );
		usage_dec();
		return false;
		}

		if ( !is_digits_only( argv[i] ) )
		{
		fprintf( stdout, "Error: Invalid acoustic environment ID specified: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}
		#endif
		arg->acousticEnvironmentId = (int16_t) atoi( argv[i++] );
		}
		else if ( strcmp( argv_to_upper, "-DPID" ) == 0 )