Merge branch 'main' into ci/enforce-warning-free-builds (85fb973d) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci-custom.yml

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		include:
		- project: $CUSTOM_CI_PROJECT
		ref: $CUSTOM_CI_REF
		file: $CUSTOM_CI_FILE
		No newline at end of file

.gitlab-ci.yml

+6 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ variables:
		IVAS_PIPELINE_NAME: ''
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		TESTCASE_TIMEOUT_STV: 900
		TESTCASE_TIMEOUT_LTV: 2400
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-mld' to run MLD test against reference float codec." # Not implemented yet, but may be good to have a manual pipeline trigger
		value: 'default'
		@@ -220,6 +222,9 @@ stages:
		- if [ $USE_LTV -eq 1 ]; then
		- *update-ltv-repo
		- *copy-ltv-files-to-testv-dir
		- testcase_timeout=$TESTCASE_TIMEOUT_LTV
		- else
		- testcase_timeout=$TESTCASE_TIMEOUT_STV
		- fi
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- if [ $LEVEL_SCALING != "1.0" ];then
		@@ -229,8 +234,6 @@ stages:

		### run pytest
		- exit_code=0
		# timeout of 15 min per individual testcase - hopefully too much, but better be safe for now
		- testcase_timeout=900
		- python3 -m pytest $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| exit_code=$?
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true

		@@ -276,7 +279,7 @@ stages:
		- make clean
		- make -j CLANG=$CLANG_NUM
		- if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi
		- testcase_timeout=300
		- testcase_timeout=TESTCASE_TIMEOUT_STV
		- python3 -m pytest $SHORT_TEST_SUITE -v --tb=no --update_ref 1 -m create_ref --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec
		artifacts:
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"

apps/decoder.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -447,6 +447,14 @@ int main(
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
		goto cleanup;
		}
		#ifdef IVAS_FLOAT_FIXED
		FOR( Word16 i = 0; i < 4; i++ )
		{
		renderConfig.directivity_fx[i * 3] = (Word16) ( renderConfig.directivity[i * 3] * ( 1u << 6 ) );
		renderConfig.directivity_fx[i * 3 + 1] = (Word16) ( renderConfig.directivity[i * 3 + 1] * ( 1u << 6 ) );
		renderConfig.directivity_fx[i * 3 + 2] = (Word16) ( renderConfig.directivity[i * 3 + 2] * ( 1u << 15 ) );
		}
		#endif // IVAS_FLOAT_FIXED

		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{

apps/renderer.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -1433,8 +1433,11 @@ int main(
		if ( i == 0 )
		{
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.audioObjects[i].inputChannelIndex, args.inConfig.numAudioObjects );

		#ifdef IVAS_FLOAT_FIXED
		if ( ( error = IVAS_REND_FeedInputAudio_fx( hIvasRend, ismIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		@@ -1450,8 +1453,11 @@ int main(
		else
		{
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.audioObjects[i].inputChannelIndex, 1 );

		#ifdef IVAS_FLOAT_FIXED
		if ( ( error = IVAS_REND_FeedInputAudio_fx( hIvasRend, ismIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		@@ -1549,7 +1555,11 @@ int main(
		{
		if ( args.delayCompensationEnabled )
		{
		#ifdef IVAS_FLOAT_FIXED
		IF( IVAS_REND_GetDelay_fx( hIvasRend, &delayNumSamples, &delayTimeScale ) != IVAS_ERR_OK )
		#else
		if ( IVAS_REND_GetDelay( hIvasRend, &delayNumSamples, &delayTimeScale ) != IVAS_ERR_OK )
		#endif // IVAS_FLOAT_FIXED
		{
		fprintf( stderr, "\nUnable to get delay of renderer!\n" );
		exit( -1 );

lib_com/arith_coder_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ void tcx_arith_scale_envelope(
		b_e = add(b_e, mean_e);

		/* scale = (-b + (float)sqrt(bb - 4.0fa0.035f)) / (2.0f a); */
		tmp = round_fx(BASOP_Util_Add_Mant32Exp(L_mult(b, b), shl(b_e, 1), Mpy_32_16_1(a, -4588/-4.0f0.035f Q15*/), a_e, &tmp2));
		tmp = round_fx_o(BASOP_Util_Add_Mant32Exp(L_mult(b, b), shl(b_e, 1), Mpy_32_16_1(a, -4588/-4.0f0.035f Q15*/), a_e, &tmp2), &Overflow);

		IF( tmp <= 0 )
		{