Merge branch 'main' into update_crend (0639df7b) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+66 −5

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ workflow:


		stages:
		- prevalidate
		- build
		- test
		- deploy
		@@ -125,6 +126,8 @@ stages:
		- cd $SCRIPTS_DIR
		- sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links
		- git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO # Add currently used branch
		- git fetch
		- git restore . # Just as a precaution
		- git checkout $BASOP_CI_BRANCH_PC_REPO
		- git pull
		- cd -
		@@ -217,6 +220,8 @@ stages:
		timeout: "240 minutes"
		variables:
		MLD_ARTIFACT_NAME: "mld--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
		MERGED_CSV_ARTIFACT_NAME: "$CI_JOB_NAME--merged_csv--$CI_JOB_ID.csv"
		PAGES_HTML_ARTIFACT_NAME: "$CI_JOB_NAME-index.html"
		script:
		- *print-common-info
		- *update-scripts-repo
		@@ -246,12 +251,12 @@ stages:
		- curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$id_previous/artifacts" --output artifacts.zip
		- unzip artifacts.zip -d previous_artifacts
		# This wildcard thingy relies on only one csv file being present per job
		- file_previous="previous_artifacts/mld--ivas-pytest-mld-long-dec-$id_previous--sha-*.csv"
		- python3 ci/basop-pages/create_report_pages.py $CI_JOB_NAME-index.html $CI_JOB_NAME--merged_csv--$CI_JOB_ID--$id_previous.csv $MLD_ARTIFACT_NAME $file_previous $CI_JOB_ID $id_previous $CI_JOB_NAME
		- file_previous="previous_artifacts/mld--$CI_JOB_NAME-$id_previous--sha-*.csv"
		- python3 ci/basop-pages/create_report_pages.py $PAGES_HTML_ARTIFACT_NAME $MERGED_CSV_ARTIFACT_NAME $MLD_ARTIFACT_NAME $file_previous $CI_JOB_ID $id_previous $CI_JOB_NAME
		- else
		# create empty file for artifacts to avoid errors
		- touch $CI_JOB_NAME-index.html
		- touch $CI_JOB_NAME--merged_csv--$CI_JOB_ID--$id_previous.csv
		- touch $MERGED_CSV_ARTIFACT_NAME
		- fi

		- if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi
		@@ -268,9 +273,9 @@ stages:
		paths:
		- report-junit.xml
		- report.html
		- $CI_JOB_NAME-index.html
		- $PAGES_HTML_ARTIFACT_NAME
		- $MLD_ARTIFACT_NAME
		- $CI_JOB_NAME-merged_csv--$CI_JOB_ID--$id_previous.csv
		- $MERGED_CSV_ARTIFACT_NAME
		expose_as: "pytest mld results"
		reports:
		junit:
		@@ -309,6 +314,62 @@ stages:
		junit:
		- report-junit.xml

		# ---------------------------------------------------------------
		# verification jobs
		# ---------------------------------------------------------------

		clang-format-check:
		extends:
		- .test-job-linux
		rules:
		- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main
		- if: $CI_PIPELINE_SOURCE == 'push'
		when: never
		- if: $CI_PIPELINE_SOURCE == 'schedule'
		when: never
		variables:
		ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix"
		stage: prevalidate
		needs: []
		timeout: "5 minutes"
		script:
		- *update-scripts-repo
		# Set up variables. This can't be done in the "variables" section because variables are not expanded properly there
		- PATCH_FILE_NAME="$ARTIFACT_BASE_NAME".patch
		- >
		INSTRUCTIONS_GITLAB="To fix formatting issues:\n
		- download the diff patch available as artifact of this job\n
		- unzip the artifact and place the patch file in the root directory of your local IVAS repo\n
		- run: git apply $PATCH_FILE_NAME\n
		- commit new changes"
		- >
		INSTRUCTIONS_README="To fix formatting issues:\n
		- place the patch file in the root directory of your local IVAS repo\n
		- run: git apply $PATCH_FILE_NAME\n
		- commit new changes"

		- format_problems=0
		- scripts/check-format.sh -afD -p 8 \|\| format_problems=$?
		- if [ $format_problems == 0 ] ; then exit 0; fi

		- mkdir tmp-formatting-fix
		- git diff > "tmp-formatting-fix/$PATCH_FILE_NAME"

		# Print instructions to job output
		- echo -e "$INSTRUCTIONS_GITLAB"

		# Include readme in the artifact, in case someone misses the job printout (e.g. getting the artifact via MR interface)
		- echo -e "$INSTRUCTIONS_README" > "tmp-formatting-fix/readme.txt"

		- exit $format_problems
		artifacts:
		expire_in: 1 day
		paths:
		- tmp-formatting-fix/
		when: on_failure
		name: "$ARTIFACT_BASE_NAME"
		expose_as: "formatting patch"

		# ---------------------------------------------------------------
		# Build jobs
		# ---------------------------------------------------------------

apps/decoder.c

+87 −80

Original line number	Diff line number	Diff line
		@@ -263,8 +263,7 @@ int main(
		if ( arg.enableHeadRotation )
		{
		/* sanity check */
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		)
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		@@ -364,8 +363,7 @@ int main(
		if ( arg.renderConfigEnabled )
		{
		/* sanity check */
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		)
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		@@ -1418,7 +1416,6 @@ static void usage_dec( void )
		}



		/---------------------------------------------------------------------
		* initOnFirstGoodFrame()
		*
		@@ -1626,7 +1623,13 @@ static ivas_error decodeG192(
		#ifdef IVAS_FLOAT_FIXED
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };
		#else
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0, }, { 0, 0,0 }, { 0, 0, 0 } };
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, {
		0,
		0,
		0,
		},
		{ 0, 0, 0 },
		{ 0, 0, 0 } };
		#endif
		int16_t vec_pos_update, vec_pos_len;

		@@ -2197,7 +2200,13 @@ static ivas_error decodeVoIP(
		#ifdef IVAS_FLOAT_FIXED
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };
		#else
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0, }, { 0, 0,0 }, { 0, 0, 0 } };
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, {
		0,
		0,
		0,
		},
		{ 0, 0, 0 },
		{ 0, 0, 0 } };
		#endif
		int16_t vec_pos_update, vec_pos_len;
		int16_t nOutSamples = 0;
		@@ -2377,8 +2386,7 @@ static ivas_error decodeVoIP(

		for ( i = 0; i < num_subframes; i++ )
		{
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i
		) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -2582,13 +2590,13 @@ static ivas_error decodeVoIP(
		}
		}

		frame++;
		// frame++;
		if ( !arg.quietModeEnabled )
		{
		fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
		}
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		//frame++;
		frame++;
		systemTime_ms += systemTimeInc_ms;
		#ifdef WMOPS
		#ifndef DONT_COUNT
		@@ -2675,5 +2683,4 @@ cleanup:
		}



		#undef WMC_TOOL_SKIP

apps/renderer.c

+45 −45

Original line number	Diff line number	Diff line
		@@ -840,7 +840,8 @@ int main(
		const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );

		#ifdef IVAS_FLOAT_FIXED
		Word32 nonDiegeticPanGain_fx = (args.nonDiegeticPanGain ==1.0f)? ONE_IN_Q31: (args.nonDiegeticPanGain == -1.0f)? L_negate(ONE_IN_Q31):(Word32)(args.nonDiegeticPanGain*(1LL<< Q31 ));
		Word32 nonDiegeticPanGain_fx = ( args.nonDiegeticPanGain == 1.0f ) ? ONE_IN_Q31 : ( args.nonDiegeticPanGain == -1.0f ) ? L_negate( ONE_IN_Q31 )
		: (Word32) ( args.nonDiegeticPanGain * ( 1LL << Q31 ) );
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, nonDiegeticPanGain_fx, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#else
		@@ -1567,7 +1568,6 @@ int main(
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}

		}

		for ( i = 0; i < args.inConfig.numAudioObjects; ++i )

lib_com/ACcontextMapping_fx.c

+16 −17

Original line number	Diff line number	Diff line
		@@ -75,4 +75,3 @@ Word16 update_mixed_context(Word16 ctx, Word16 a)
		}
		return add( shl( s_and( ctx, 0xf ), 4 ), add( t, 13 ) );
		}

lib_com/ari_hm.c

+60 −61

Original line number	Diff line number	Diff line
		@@ -106,8 +106,7 @@ void UnmapIndex_fx(
		const Word16 LtpPitchLag,
		const Word8 SmallerLags,
		Word16 *FractionalResolution,
		Word32 *Lag
		)
		Word32 *Lag )
		{
		Word16 LtpPitchIndex, Multiplier;
		Word16 Lag16;
		@@ -146,7 +145,8 @@ void UnmapIndex_fx(
		move16();
		Lag16 = add( PeriodicityIndex, GET_ADJ2( 80, 12, 3 ) );
		}
		ELSE {
		ELSE
		{
		test();
		IF( LT_16( PeriodicityIndex, 224 ) \|\| SmallerLags != 0 )
		{
		@@ -154,7 +154,8 @@ void UnmapIndex_fx(
		move16();
		Lag16 = add( PeriodicityIndex, GET_ADJ2( 208, 28, 1 ) );
		}
		ELSE {
		ELSE
		{
		*FractionalResolution = 0;
		move16();
		Lag16 = add( PeriodicityIndex, GET_ADJ2( 224, 188, 0 ) );
		@@ -262,8 +263,7 @@ int16_t CountIndexBits_ivas(

		Word16 CountIndexBits_fx(
		Word16 Bandwidth,
		Word16 PeriodicityIndex
		)
		Word16 PeriodicityIndex )
		{
		Word16 result;
		Word16 PeriodicityIndexS;
		@@ -486,7 +486,6 @@ void tcx_hm_modify_envelope_fx(
		h = add( h, 1 );
		k = extract_l( L_shr( imult3216( lag, h ), fract_res ) );
		}

		}