formal improvements (157d4854) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -962,7 +962,7 @@ int main(
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		destroy_crend_hrtf( hHrtfCrend );
		#else
		destroy_crend_hrtf( hSetOfHRTF );
		destroy_SetOfHRTF( hSetOfHRTF );
		#endif
		}
		}

lib_rend/ivas_crend.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,11 @@ static ivas_error ivas_hrtf_open(
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend HRTFS Handle\n" );
		}

		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = ivas_Crend_hrtf_init( hHrtf ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_hrtf_init( hHrtf ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -1593,10 +1597,12 @@ void ivas_rend_closeCrend(

		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( pCrend )->hHrtfCrend != NULL && ( pCrend )->hHrtfCrend->init_from_rom )
		#else
		if ( ( pCrend )->hHrtfCrend != NULL && ( pCrend )->hHrtfCrend->init_from_rom )
		#endif
		{
		ivas_hrtf_close( &( *pCrend )->hHrtfCrend );
		}
		#endif

		for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )
		{

lib_util/hrtf_file_reader.c

+11 −10

Original line number	Diff line number	Diff line
		@@ -1131,7 +1131,7 @@ static ivas_error create_HRTF_from_rawdata(
		}
		}

		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		mem_size = ( hHRTF )->max_num_iterations sizeof( uint16_t );

		#endif
		@@ -1140,7 +1140,7 @@ static ivas_error create_HRTF_from_rawdata(
		{
		for ( j = 0; j < BINAURAL_CHANNELS; j++ )
		{
		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = ivas_HRTF_CRend_binary_open_buffers_uint16( &( *hHRTF )->pIndex_frequency_max_dyn[i][j], mem_size ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1176,7 +1176,7 @@ static ivas_error create_HRTF_from_rawdata(
		for ( j = 0; j < BINAURAL_CHANNELS; j++ )
		{
		mem_size = ( hHRTF )->num_iterations_diffuse[j] sizeof( uint16_t );
		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = ivas_HRTF_CRend_binary_open_buffers_uint16( &( *hHRTF )->pIndex_frequency_max_diffuse_dyn[j], mem_size ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1221,7 +1221,7 @@ static ivas_error create_HRTF_from_rawdata(
		factorQ = ( (Word16 ) ( hrtf_data_rptr ) );
		hrtf_data_rptr += sizeof( Word16 );

		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		mem_size_buf = max_total_num_fsamp_per_iteration * sizeof( float );

		#endif
		@@ -1230,7 +1230,7 @@ static ivas_error create_HRTF_from_rawdata(
		{
		for ( j = 0; j < BINAURAL_CHANNELS; j++ )
		{
		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = ivas_HRTF_CRend_binary_open_buffers_float( &( *hHRTF )->pOut_to_bin_re_dyn[i][j], mem_size_buf ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1268,7 +1268,7 @@ static ivas_error create_HRTF_from_rawdata(
		{
		for ( j = 0; j < BINAURAL_CHANNELS; j++ )
		{
		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = ivas_HRTF_CRend_binary_open_buffers_float( &( *hHRTF )->pOut_to_bin_im_dyn[i][j], mem_size_buf ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1304,7 +1304,7 @@ static ivas_error create_HRTF_from_rawdata(
		max_total_num_fsamp_per_iteration_diff = ( (uint32_t ) ( hrtf_data_rptr ) );
		hrtf_data_rptr += sizeof( uint32_t );

		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		mem_size_buf = max_total_num_fsamp_per_iteration_diff * sizeof( float );

		#endif
		@@ -1315,7 +1315,7 @@ static ivas_error create_HRTF_from_rawdata(
		/* coeff_diffuse_re : The size depends on pIndex_frequency_max_diffuse */
		for ( j = 0; j < BINAURAL_CHANNELS; j++ )
		{
		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = ivas_HRTF_CRend_binary_open_buffers_float( &( *hHRTF )->pOut_to_bin_diffuse_re_dyn[j], mem_size_buf ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1350,7 +1350,7 @@ static ivas_error create_HRTF_from_rawdata(
		/* coeff_diffuse_im : The size depends on pIndex_frequency_max_diffuse */
		for ( j = 0; j < BINAURAL_CHANNELS; j++ )
		{
		#if 1
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = ivas_HRTF_CRend_binary_open_buffers_float( &( *hHRTF )->pOut_to_bin_diffuse_im_dyn[j], mem_size_buf ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -2142,10 +2142,11 @@ ivas_error load_parambin_HRTF_from_binary(
		* Create the HRTF data set from the binary file for Crend renderer
		---------------------------------------------------------------------/

		ivas_error load_Crend_HRTF_from_binary(
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		ivas_error load_Crend_HRTF_from_binary(
		IVAS_DEC_HRTF_CREND_HANDLE hHrtfCrend, /* i/o: HRTF CRend handle */
		#else
		ivas_error create_SetOfHRTF_from_binary(
		IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF, /* i/o: HRTF CRend handle */
		#endif
		const hrtfFileReader hrtfReader, / i : pointer to hrtfFileReader handle */

lib_util/hrtf_file_reader.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -107,10 +107,11 @@ ivas_error load_reverb_binary(
		* Create the HRTF data set from the binary file
		---------------------------------------------------------------------/

		ivas_error load_Crend_HRTF_from_binary(
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		ivas_error load_Crend_HRTF_from_binary(
		IVAS_DEC_HRTF_CREND_HANDLE hHrtfCrend, /* i/o: HRTF CRend handle */
		#else
		ivas_error create_SetOfHRTF_from_binary(
		IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF, /* i/o: Set of HRTF CRend handle */
		#endif
		const hrtfFileReader hrtfReader, / i : pointer to hrtfFileReader handle */

lib_rend/lib_rend.c

+1 −1

File changed.

Contains only whitespace changes.