Merge branch 'main' into 398-masa-direction-field-alignment (d5e90e92) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+15 −8

Original line number	Diff line number	Diff line
		@@ -783,13 +783,13 @@ codec-comparison-on-main-push:
		.sanitizer-test-schedule-A:
		extends:
		- .sanitizer-test-template
		timeout: 2 hours 30 minutes


		sanitizer-test-mono:
		extends: .sanitizer-test-schedule-A
		rules:
		- if: $SANITIZER_SCHEDULE_A
		timeout: 2 hour
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS
		@@ -799,7 +799,8 @@ sanitizer-test-stereo:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 2 hours 30 minutes
		start_in: 2 hour
		timeout: 2 hour
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS
		@@ -809,7 +810,8 @@ sanitizer-test-stereodmxevs:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 5 hours
		start_in: 4 hours
		timeout: 2 hour
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py StereoDmxEVS mono --tests $SANITIZER_TESTS
		@@ -819,7 +821,8 @@ sanitizer-test-ism1:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 7 hours 30 minutes
		start_in: 6 hours
		timeout: 2 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
		@@ -829,7 +832,8 @@ sanitizer-test-ism2:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 10 hours
		start_in: 8 hours
		timeout: 3 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
		@@ -839,7 +843,8 @@ sanitizer-test-ism3:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 12 hours 30 minutes
		start_in: 11 hours
		timeout: 3 hour
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
		@@ -849,7 +854,8 @@ sanitizer-test-ism4:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 15 hours
		start_in: 14 hours
		timeout: 4 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
		@@ -859,7 +865,8 @@ sanitizer-test-masa:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 17 hours 30 minutes
		start_in: 18 hours
		timeout: 3 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS

apps/encoder.c

+7 −15

Original line number	Diff line number	Diff line
		@@ -386,16 +386,8 @@ int main(
		}
		break;
		case IVAS_ENC_INPUT_SBA:
		if ( ( error =
		IVAS_ENC_ConfigureForAmbisonics(
		hIvasEnc,
		arg.inputFs,
		totalBitrate,
		arg.max_bwidth_user,
		bandwidth,
		arg.dtxConfig,
		arg.inputFormatConfig.sba.order,
		arg.inputFormatConfig.sba.isPlanar,
		if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig,
		arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar,
		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		arg.agc,
		#endif

apps/renderer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -675,11 +675,7 @@ int main(
		}

		/* === Configure === */
		#ifdef FIX_392_LATE_REVERB
		if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_InitConfig( hIvasRend, ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) \|\| ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error in Renderer Config Init\n" );
		exit( -1 );

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@

		#define FIX_389_EXT_REND_PCM_SR /* Nokia: Issue 389: Fix assignment of sample rate with PCM input. */
		#define FIX_390_EXT_REND_MASA_META_COPY /* Nokia: Issue 390: Fixes MASA metadata copying to renderer. */
		#define FIX_392_LATE_REVERB /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/

		#define FIX_ISM_DTX_CLICKS /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */

lib_dec/ivas_stereo_switching_dec.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -421,8 +421,7 @@ ivas_error stereo_memory_dec(
		deallocate_CoreCoder( hCPE->hCoreCoder[1] );

		/* allocate DFT stereo data structure */
		if ( ( error = stereo_dft_dec_create( &( hCPE->hStereoDft ), hCPE->element_brate, output_Fs, 0,
		nchan_transport ) ) != IVAS_ERR_OK )
		if ( ( error = stereo_dft_dec_create( &( hCPE->hStereoDft ), hCPE->element_brate, output_Fs, 0, nchan_transport ) ) != IVAS_ERR_OK )
		{
		return error;
		}