Merge remote-tracking branch 'origin/ivas-float-update' into 1863_ref_port_fl1678 (3d842be3) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -216,8 +216,11 @@
		#define FIX_587_DEFAULT_REVERB /* Philips: issue 587: inconsistent default reverb parameters across renderers */
		#define NONBE_1214_PLC_LSF_MEMORY /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */
		#define NONBE_1293_SR_HRTF /* VA: issue 1293: add support of external HRTFs in split rendering */
		#define FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX /* VA: issue 1249: remove obsolete code around ALLRAD decoder matrix */
		#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */
		#define FIX_1369_HQ_LR_OVERFLOW /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */
		#define NONBE_1118_EVS_LR_HQ_BITERROR /* VA: issue 1118: fix EVS decoder crash in LR-HQ in case of bit errors */
		#define FIX_1139_REV_COLORATION_SHORT_T60 /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */

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

lib_dec/hq_lr_dec.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -616,10 +616,30 @@ void hq_lr_dec(

		IF( sub( i, highband ) >= 0 )
		{
		#ifdef NONBE_1118_EVS_LR_HQ_BITERROR
		/* safety check in case of bit errors */
		if ( Ep_fx[i] > 536788991 /* max(Q30) */ )
		{
		st->BER_detect = 1;
		set_f( yout, 0, inner_frame );
		return;
		}

		#endif
		enerH_fx = L_add( enerH_fx, L_shl( Ep_fx[i], 2 ) ); /Q0 /
		}
		ELSE IF( sub( i, lowband ) >= 0 )
		{
		#ifdef NONBE_1118_EVS_LR_HQ_BITERROR
		/* safety check in case of bit errors */
		if ( Ep_fx[i] > 536788991 /* max(Q30) */ )
		{
		st->BER_detect = 1;
		set_f( yout, 0, inner_frame );
		return;
		}

		#endif
		enerL_fx = L_add( enerL_fx, L_shl( Ep_fx[i], 2 ) ); /Q0 /
		}
		}

lib_dec/ivas_binRenderer_internal.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -1200,7 +1200,19 @@ ivas_error ivas_binRenderer_open(
		{
		#ifdef FIX_587_DEFAULT_REVERB
		pRoomAcoustics = ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ? &( st_ivas->hRenderConfig->roomAcoustics ) : NULL;
		if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, pRoomAcoustics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ),
		st_ivas->hHrtfStatistics,
		hBinRenderer->conv_band,
		hBinRenderer->timeSlots,
		pRoomAcoustics,
		st_ivas->hDecoderConfig->output_Fs,
		st_ivas->hHrtfFastConv->fastconvReverberationTimes,
		st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections
		#ifdef FIX_1139_REV_COLORATION_SHORT_T60
		,
		NULL
		#endif
		) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections ) ) != IVAS_ERR_OK )
		#endif

lib_dec/ivas_init_dec.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1643,7 +1643,7 @@ ivas_error ivas_init_decoder(
		{
		return error;
		}

		#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX
		if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->hOutSetup.is_loudspeaker_setup )
		{
		if ( ( error = ivas_sba_get_hoa_dec_matrix( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK )
		@@ -1651,6 +1651,7 @@ ivas_error ivas_init_decoder(
		return error;
		}
		}
		#endif

		if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ),
		st_ivas->ivas_format ) ) != IVAS_ERR_OK )
		@@ -1801,7 +1802,7 @@ ivas_error ivas_init_decoder(
		{
		return error;
		}

		#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX
		if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->hOutSetup.is_loudspeaker_setup )
		{
		if ( ( error = ivas_sba_get_hoa_dec_matrix( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK )
		@@ -1809,6 +1810,7 @@ ivas_error ivas_init_decoder(
		return error;
		}
		}
		#endif

		if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ),
		st_ivas->ivas_format ) ) != IVAS_ERR_OK )

lib_dec/ivas_output_config.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,12 @@ void ivas_renderer_select(
		{
		*internal_config = output_config;
		}
		#ifdef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX
		else
		{
		*internal_config = IVAS_AUDIO_CONFIG_HOA3;
		}
		#else
		else if ( output_config == IVAS_AUDIO_CONFIG_MONO \|\| output_config == IVAS_AUDIO_CONFIG_STEREO )
		{
		*internal_config = IVAS_AUDIO_CONFIG_FOA;
		@@ -346,6 +352,7 @@ void ivas_renderer_select(
		{
		*internal_config = IVAS_AUDIO_CONFIG_HOA3;
		}
		#endif
		*renderer_type = RENDERER_SBA_LINEAR_DEC;
		}
		else if ( ( ivas_format == MASA_FORMAT && output_config == IVAS_AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) \|\|
		@@ -365,10 +372,12 @@ void ivas_renderer_select(
		{
		*renderer_type = RENDERER_DISABLE;
		}
		#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX
		else if ( ivas_format == SBA_FORMAT && output_config == IVAS_AUDIO_CONFIG_MONO )
		{
		*renderer_type = RENDERER_SBA_LINEAR_DEC;
		}
		#endif
		else if ( ivas_format == SBA_ISM_FORMAT && output_config == IVAS_AUDIO_CONFIG_STEREO )
		{
		*renderer_type = RENDERER_OSBA_STEREO;