Merge branch 'main' into b_20240126_OSBA-Xover-BR (a12757da) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1351,7 +1351,7 @@ ivas-conformance:
		timeout: "60 minutes"
		rules:
		- if: ($CI_PIPELINE_SOURCE == 'web' \|\| $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
		# - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		allow_failure:
		exit_codes:
		- 123

+17 −0

Original line number	Diff line number	Diff line
		@@ -1704,6 +1704,15 @@ static bool parseCmdlIVAS_dec(
		usage_dec();
		return false;
		}

		#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK
		if ( arg->outputMdFilename != NULL && arg->outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		fprintf( stderr, "Error: Output split rendering metadata file is supported for BINAURAL_SPLIT_PCM output config. only\n\n" );
		usage_dec();
		return false;
		}
		#endif
		}
		else
		{
		@@ -1990,6 +1999,14 @@ static ivas_error initOnFirstGoodFrame(
		}
		else
		{
		#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK
		if ( arg.outputMdFilename == NULL )
		{
		fprintf( stderr, "\nOutput split rendering metadata file not specified\n" );
		return IVAS_ERR_INVALID_SPLIT_REND_CONFIG;
		}
		#endif

		if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to open output split rendering metadata file %s\n", arg.outputWavFilename );

+0 −6

Original line number	Diff line number	Diff line
		@@ -982,20 +982,14 @@ ivas_error ivas_ism_metadata_enc_create(

		ivas_error ivas_ism_metadata_dec_create(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
		const int16_t n_ISms, /* i : number of separately coded objects */
		#else
		const int16_t n_ISms, /* i : number of objects */
		#endif
		int32_t element_brate_tmp[] /* o : element bitrate per object */
		);

		#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
		void ivas_ism_reset_metadata_handle_dec(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		);

		#endif
		ivas_error ivas_ism_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		float data[], / i : input signal [channels][samples] */

+4 −2

Original line number	Diff line number	Diff line
		@@ -159,8 +159,7 @@
		#define FIX_NUM_SUBFRAME_UPDATE

		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */
		#define FIX_1060_USAN_ARRAY_BOUNDS /* FhG: issue 1060: USAN array-bounds errors */

		#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

		/* #################### End BE switches ################################## */

		@@ -168,10 +167,13 @@
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */

		<<<<<<< HEAD
		#define NONBE_FIX_ISM_XOVER_BR /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */
		#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */
		#define NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES /* Philips: issue 1067: QuaternionSlerp inaccuracies in corner cases */
		#define NONBE_FIX_1065_ISM_MD_HANDLE /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */
		=======
		>>>>>>> main
		#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

		#define NONBE_FIX_SBA_SIGNALING_BITS_B /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

+0 −5

Original line number	Diff line number	Diff line
		@@ -2317,13 +2317,8 @@ void ivas_dirac_dec_render_sf(

		for ( l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )
		{
		#ifdef FIX_1060_USAN_ARRAY_BOUNDS
		Cldfb_RealBuffer[j2][k][l] += g * *( tc_re++ );
		Cldfb_ImagBuffer[j2][k][l] += g * *( tc_im++ );
		#else
		Cldfb_RealBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_re++ );
		Cldfb_ImagBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_im++ );
		#endif
		}
		w1 += hSpatParamRendCom->num_freq_bands;
		}