Merge branch 'main' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into... (70626606) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@
		#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 NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */
		#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/ivas_binRenderer_internal_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1361,7 +1361,11 @@ ivas_error ivas_binRenderer_open_fx(
		{
		pRoomAcoustics = &( st_ivas->hRenderConfig->roomAcoustics );
		}
		#ifdef FIX_1139_REV_COLORATION_SHORT_T60
		IF( NE_32( ( 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_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx, NULL ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( 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_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )
		#endif
		#else
		IF( NE_32( ( 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_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )
		#endif

lib_dec/lib_dec_fx.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -2926,7 +2926,11 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		IF( hIvasDec->st_ivas->hDiracDecBin[0] != NULL && hIvasDec->st_ivas->hDiracDecBin[0]->hReverb != NULL )
		{
		ivas_binaural_reverb_close_fx( &( hIvasDec->st_ivas->hDiracDecBin[0]->hReverb ) );
		#ifdef FIX_1139_REV_COLORATION_SHORT_T60
		IF( ( error = ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hDiracDecBin[0]->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL, NULL ) ) != IVAS_ERR_OK )
		#else
		IF( ( error = ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hDiracDecBin[0]->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -2937,7 +2941,11 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		IF( hIvasDec->st_ivas->hBinRenderer != NULL && hIvasDec->st_ivas->hBinRenderer->hReverb != NULL )
		{
		ivas_binaural_reverb_close_fx( &( hIvasDec->st_ivas->hBinRenderer->hReverb ) );
		#ifdef FIX_1139_REV_COLORATION_SHORT_T60
		IF( ( error = ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hBinRenderer->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hBinRenderer->conv_band, hIvasDec->st_ivas->hBinRenderer->timeSlots, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL, NULL ) ) != IVAS_ERR_OK )
		#else
		IF( ( error = ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hBinRenderer->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hBinRenderer->conv_band, hIvasDec->st_ivas->hBinRenderer->timeSlots, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

100755 → 100644

+4 −0

Original line number	Diff line number	Diff line
		@@ -339,7 +339,11 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx(

		#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF
		#ifdef FIX_587_DEFAULT_REVERB
		#ifdef FIX_1139_REV_COLORATION_SHORT_T60
		IF( NE_32( ( error = ivas_binaural_reverb_init( &hDiracDecBin->hReverb, st_ivas->hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, pRoomAcoustics, output_Fs, ( phHrtfParambin )->parametricReverberationTimes_fx, ( phHrtfParambin )->parametricReverberationEneCorrections_fx, hDiracDecBin->earlyPartEneCorrection_fx ) ), IVAS_ERR_OK ) )
		#else
		if ( NE_32( ( error = ivas_binaural_reverb_init( &hDiracDecBin->hReverb, st_ivas->hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, pRoomAcoustics, output_Fs, ( phHrtfParambin )->parametricReverberationTimes_fx, ( phHrtfParambin )->parametricReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )
		#endif
		#else
		if ( NE_32( ( error = ivas_binaural_reverb_init( &hDiracDecBin->hReverb, st_ivas->hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( st_ivas->hRenderConfig->roomAcoustics ), output_Fs, ( phHrtfParambin )->parametricReverberationTimes_fx, ( phHrtfParambin )->parametricReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )
		#endif

lib_rend/ivas_prot_rend_fx.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -953,6 +953,10 @@ ivas_error ivas_binaural_reverb_init(
		const Word32 sampling_rate, /* i : sampling rate */
		const Word32 defaultTimes, / i : default reverberation times */
		const Word32 defaultEne / i : default reverberation energies */
		#ifdef FIX_1139_REV_COLORATION_SHORT_T60
		,
		Word32 earlyEne / i/o: Early part energies to be modified */
		#endif
		);

		void ivas_binaural_reverb_close_fx(