Merge remote-tracking branch 'origin/ivas-float-update' into 1565_ref_PortFlpMR1504 (a60f081b) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,8 @@
		#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		#endif
		#define FIX_1043_JBM_MD_BUFFER /* VA: issue 1043: JBM MD handle allocation is avoided in non-JBM EXT operations */

		#define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */
		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */
		#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on )*/
		@@ -187,6 +189,9 @@
		#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */
		#define NONBE_FIX_1056_ISM_RATE_SWITCH /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */
		#define FIX_970_USAN_IN_NELP_SEED
		#define NONBE_FIX_1075 /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */
		#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB /* FhG: fix bug in TD MDCT-Stereo concealment */
		#define FIX_1044_ISM_REND_MEMORY /* VA: issue 1044: Lower the memory of the ISM renderer handle. */
		#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */

		#define NONBE_FIX_984_OMASA_EXT_OUTPUT /* Nok: issue 1497 - porting OMASA EXT MR */

lib_dec/er_dec_tcx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -567,7 +567,11 @@ void con_tcx(

		alpha_inv = 1.0f - alpha_delayed;

		#ifdef NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB
		a2lsp_stab( A_local, lsp_local, st->lspold_cng );
		#else
		a2lsp_stab( A_local, lsp_local, lsp_local );
		#endif

		for ( i = 0; i < M; i++ )
		{

lib_dec/ivas_init_dec.c

+24 −0

Original line number	Diff line number	Diff line
		@@ -2007,6 +2007,15 @@ ivas_error ivas_init_decoder(
		{
		return error;
		}
		#ifdef NONBE_FIX_1075
		if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif

		/* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
		if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
		@@ -2077,6 +2086,16 @@ ivas_error ivas_init_decoder(
		{
		return error;
		}
		#ifdef NONBE_FIX_1075
		if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}

		#endif
		}
		}

		@@ -2182,7 +2201,12 @@ ivas_error ivas_init_decoder(
		}
		}


		#ifdef FIX_1043_JBM_MD_BUFFER
		if ( st_ivas->hJbmMetadata == NULL && st_ivas->hDecoderConfig->Opt_tsm )
		#else
		if ( st_ivas->hJbmMetadata == NULL )
		#endif
		{
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{

lib_dec/ivas_jbm_dec.c

+21 −2

Original line number	Diff line number	Diff line
		@@ -214,7 +214,11 @@ ivas_error ivas_jbm_dec_tc(
		return error;
		}

		#ifdef FIX_1043_JBM_MD_BUFFER
		if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hDecoderConfig->Opt_tsm )
		#else
		if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		#endif
		{
		ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );
		}
		@@ -423,9 +427,14 @@ ivas_error ivas_jbm_dec_tc(

		ivas_omasa_rearrange_channels( p_output, nchan_transport_ism, output_frame );
		#endif
		#ifdef FIX_1043_JBM_MD_BUFFER
		if ( st_ivas->hDecoderConfig->Opt_tsm )
		#endif
		{
		ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );
		}
		}
		}
		else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )
		{
		int16_t nchan_ism, sba_ch_idx;
		@@ -822,7 +831,11 @@ void ivas_jbm_dec_feed_tc_to_renderer(
		{
		ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );

		#ifdef FIX_1043_JBM_MD_BUFFER
		if ( ( st_ivas->ivas_format == MASA_FORMAT \|\| st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hDecoderConfig->Opt_tsm )
		#else
		if ( ( st_ivas->ivas_format == MASA_FORMAT \|\| st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		#endif
		{
		ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );
		}
		@@ -902,8 +915,14 @@ void ivas_jbm_dec_feed_tc_to_renderer(
		if ( st_ivas->renderer_type == RENDERER_OMASA_MIX_EXT \|\| st_ivas->renderer_type == RENDERER_OMASA_OBJECT_EXT )
		{
		ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );

		#ifdef FIX_1043_JBM_MD_BUFFER
		if ( st_ivas->hDecoderConfig->Opt_tsm )
		#endif
		{
		ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );
		}
		}
		else
		{
		#endif

lib_dec/ivas_mct_dec.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1227,6 +1227,15 @@ static ivas_error ivas_mc_dec_reconfig(
		{
		return error;
		}
		#ifdef NONBE_FIX_1075
		if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif

		if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{