Merge remote-tracking branch 'remotes/origin/main' into 1902-basop-PortFlpMr1832 (bbaa9f44) · Commits · SA4 / Audio / IVAS BASOP

apps/renderer.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -1167,7 +1167,18 @@ int main(
		fprintf( stderr, "\nFailed to read renderer configuration from file %s\n", args.renderConfigFilePath );
		goto cleanup;
		}

		#ifdef NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND
		if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity_fx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", args.directivityPatternId[0], args.directivityPatternId[1], args.directivityPatternId[2], args.directivityPatternId[3] );
		goto cleanup;
		}
		if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt_fx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
		goto cleanup;
		}
		#endif
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION

lib_com/ivas_spar_com_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -802,7 +802,11 @@ static void ivas_get_pred_coeffs_enc_fx(
		tmp64 = W_mult0_32_32( w_norm_fac, dm_w ); // Q=q_tmp
		IF( LT_16( q_tmp, q_cov_real[0][0][b] ) )
		{
		#ifdef FIX_ISSUE_1811_EXCEEDING_W_SHIFTS
		tmp64 = W_shr( tmp64, s_min( 63, sub( q_cov_real[0][0][b], q_tmp ) ) ); // Q=q_tmp
		#else
		tmp64 = W_shr( tmp64, sub( q_cov_real[0][0][b], q_tmp ) ); // Q=q_tmp
		#endif
		}
		ELSE
		{

lib_com/options.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -82,6 +82,9 @@
		#define FIX_ISSUE_1817_REPLACE_CARRY_OVERFLOW /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 1931 */
		#define NONBE_SVD_OPTIMIZATION /* FhG: reduce WMOPS of HouseHolderReduction() in ivas_svd_dec.c() by removing redundant mathematics and using 64 bit additions */
		#define FIX_1766_TCX2ACELP_BWE_ISSUE /* VA : Fix rare BWE issue when switching from TCX to ACELP */
		#define FIX_1781_SPECTRAL_GAPS /* FhG: Change internal calculation of tcx_noise_factor_ivas_fx() to 32-bit*/
		#define FIX_ISSUE_1811_EXCEEDING_W_SHIFTS /* FhG: limit exceeding 64bit shifts */


		/* #################### Start BASOP porting switches ############################ */

		@@ -118,6 +121,7 @@
		#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */
		#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/
		#define NONBE_FIX_1052_SBA_EXT_FIX /* VA: SBA external output support fix - do not overwrite "output_config" parameter */
		#define NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION /* Ericsson: Issue 1196, Always apply filter interpolation for each subframe */
		#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */
		#define FIX_1099_JBM_MD_HANDLE_ALLOC /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */
		#define FIX_1121_MASA_DESCRIPTOR /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */
		@@ -131,7 +135,7 @@
		#define NONBE_1131_ACELP_OOB /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */
		#define NONBE_1240_FIX_CORE_SELECTION_ISM_SW /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */
		#define FIX_1101_CLEANING_JBM_CALL /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */

		#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */

		/* #################### End BASOP porting switches ############################ */

lib_com/swb_tbe_com_fx.c

100644 → 100755

+4 −0

Original line number	Diff line number	Diff line
		@@ -6903,7 +6903,11 @@ void synthesise_fb_high_band_fx(
		Word64 W_temp;

		t_Q = sub( shl( exp_tmp, 1 ), 8 );
		#ifdef FIX_ISSUE_1811_EXCEEDING_W_SHIFTS
		P_ONE = W_shl( P_ONE, s_min( 63, sub( t_Q, 15 ) ) );
		#else
		P_ONE = W_shl( P_ONE, sub( t_Q, 15 ) );
		#endif

		W_temp = W_add( P_ONE, temp1 );

lib_com/tns_base.c

100644 → 100755

+4 −1

Original line number	Diff line number	Diff line
		@@ -651,8 +651,11 @@ Word16 ITF_Detect_ivas_fx(
		{
		sum = W_mac_32_32( sum, temp_spectrum[i], temp_spectrum[i] ); // 2(Q+shift)+1
		}

		#ifdef FIX_ISSUE_1811_EXCEEDING_W_SHIFTS
		IF( LE_64( sum, W_shl( 32768 * 2 /* HLM_MIN_NRG in Q1 */, s_min( 63, shl( add( Q, shift ), 1 ) ) ) ) )
		#else
		IF( LE_64( sum, W_shl( 32768 * 2 /* HLM_MIN_NRG in Q1 */, shl( add( Q, shift ), 1 ) ) ) )
		#endif
		{
		BREAK;
		}