[cleanup] accept FIX_329_ENABLE_TD_RENDERER_REVERB_MC (4794fcd6) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,6 @@
		#define DISABLE_ADAP_RES_COD_TMP /* temporary fix for IVAS-403, disables adaptive residual coding */
		/#define ITD_WINNER_GAIN_MODIFY / /* ITD optimization - WORK IN PROGRESS */
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define FIX_329_ENABLE_TD_RENDERER_REVERB_MC /* Eri: Enable reverb for TD renderer for 5.1 and 7.1 with headtracking enabled for IVAS_dec */
		#define FIX_330_ENABLE_TD_RENDERER_REVERB_REND /* Eri: Enable reverb for TD renderer for ISM, 5.1 and 7.1 with headtracking enabled for IVAS_rend */

		#define FIX_347_DTX_CRASH /* FhG: Fix crash that can happen with DTX */

lib_dec/ivas_binRenderer_internal.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -866,7 +866,6 @@ void ivas_binaural_add_LFE(

		if ( render_lfe )
		{
		#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )
		{
		gain = GAIN_LFE;
		@@ -875,9 +874,6 @@ void ivas_binaural_add_LFE(
		{
		gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE;
		}
		#else
		gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE;
		#endif
		for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ )
		{
		v_multc( output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame );

lib_dec/ivas_init_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1228,15 +1228,7 @@ ivas_error ivas_init_decoder(
		return error;
		}
		#else
		#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
		if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK )
		#else
		if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
		}
		if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
		#endif
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" );
		}

lib_dec/ivas_mct_dec.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1130,18 +1130,12 @@ static ivas_error ivas_mc_dec_reconfig(

		if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
		{
		#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
		if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK )
		#else
		if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )
		#endif
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
		}
		#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
		st_ivas->hCrendWrapper->hCrend = NULL;
		st_ivas->hCrendWrapper->hHrtfCrend = NULL;
		#endif
		if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" );

lib_rend/ivas_crend.c

+0 −50

Original line number	Diff line number	Diff line
		@@ -675,7 +675,6 @@ static ivas_error ivas_rend_initCrend(
		return IVAS_ERR_OK;
		}

		#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
		/*-------------------------------------------------------------------------
		* ivas_rend_initCrendWrapper()
		*
		@@ -731,7 +730,6 @@ ivas_error ivas_rend_initCrendWrapper(

		return IVAS_ERR_OK;
		}
		#endif
		/*-------------------------------------------------------------------------
		* ivas_rend_openCrend()
		*
		@@ -755,29 +753,11 @@ ivas_error ivas_rend_openCrend(
		ivas_error error;

		error = IVAS_ERR_OK;
		#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
		if ( ( error = ivas_rend_initCrendWrapper( pCrend ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		hCrend = ( *pCrend )->hCrend;
		#else
		if ( pCrend == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
		}

		if ( *pCrend == NULL )
		{
		if ( ( *pCrend = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
		}
		( *pCrend )->binaural_latency_ns = 0;
		( *pCrend )->hCrend = NULL;
		( *pCrend )->hHrtfCrend = NULL;
		}
		#endif

		subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES;

		@@ -789,36 +769,6 @@ ivas_error ivas_rend_openCrend(
		}
		}

		#ifndef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

		if ( ( hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" );
		}

		hCrend->lfe_delay_line = NULL;

		for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )
		{
		hCrend->freq_buffer_re[i] = NULL;
		hCrend->freq_buffer_im[i] = NULL;
		}

		for ( i = 0; i < BINAURAL_CHANNELS; i++ )
		{
		hCrend->prev_out_buffer[i] = NULL;
		}

		hCrend->freq_buffer_re_diffuse = NULL;
		hCrend->freq_buffer_im_diffuse = NULL;
		hCrend->hReverb = NULL;
		hCrend->delay_line_rw_index = 0;
		hCrend->diffuse_delay_line_rw_index = 0;
		hCrend->hTrack = NULL;
		hCrend->m_fYaw = 0;
		hCrend->m_fPitch = 0;
		hCrend->m_fRoll = 0;
		#endif


		hHrtf = ( *pCrend )->hHrtfCrend;