Merge branch 'main' into sba-ext (60845105) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+5 −5

Original line number	Diff line number	Diff line
		@@ -1578,7 +1578,7 @@ ltv-msan:
		- .sanitizer-selftest-ltv
		rules:
		- if: $SANITIZER_SCHEDULE_E
		timeout: 2 hour
		timeout: 3 hour
		tags:
		- ivas-linux-fast
		before_script:
		@@ -1594,10 +1594,10 @@ ltv-asan:
		rules:
		- if: $SANITIZER_SCHEDULE_E
		when: delayed
		start_in: 2 hours
		start_in: 3 hours
		tags:
		- ivas-linux-fast
		timeout: 2 hour
		timeout: 3 hour
		before_script:
		- CLANG_NUM=2
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS
		@@ -1611,10 +1611,10 @@ ltv-usan:
		rules:
		- if: $SANITIZER_SCHEDULE_E
		when: delayed
		start_in: 3 hours
		start_in: 6 hours
		tags:
		- ivas-linux-fast
		timeout: 2 hour
		timeout: 3 hour
		before_script:
		- CLANG_NUM=3
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS

+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 );

+4 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,10 @@

		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

		#define FIX_1082_INSTRUM_FAILED_LC3PLUS /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

		#define FIX_1077_MEMORY_TEST_MISSING /* orange: issue 1077 : add missing memory test*/
		#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -925,10 +925,11 @@ ivas_error ivas_dirac_dec_config(

		ivas_dirac_dec_get_frequency_axis( frequency_axis, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSpatParamRendCom->num_freq_bands );

		if ( ( error = ivas_dirac_dec_decorr_open(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( ( error = ivas_dirac_dec_decorr_open( &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,
		&( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,
		#else
		if ( ( error = ivas_dirac_dec_decorr_open( &( st_ivas->hDiracDecBin->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,
		&( st_ivas->hDiracDecBin->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,
		#endif
		DIRAC_SYNTHESIS_PSD_LS, frequency_axis, BINAURAL_CHANNELS, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{

+5 −6

Original line number	Diff line number	Diff line
		@@ -1413,18 +1413,17 @@ ivas_error ivas_masa_dec_reconfigure(
		{
		if ( st_ivas->hDiracDecBin[pos_idx] != NULL )
		{
		#else
		if ( st_ivas->hDiracDecBin != NULL )
		{
		#endif
		/* regularization factor is bitrate-dependent */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		st_ivas->hDiracDecBin[pos_idx]->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );
		}
		}
		#else
		if ( st_ivas->hDiracDecBin != NULL )
		{
		/* regularization factor is bitrate-dependent */
		st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );
		#endif
		}
		#endif

		if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->last_ivas_format == MASA_FORMAT ) /* note: switching within OMASA is handled in ivas_omasa_dec_config() */
		{