Corrected function names per fixed point (e972f426) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -743,7 +743,6 @@ int main(
		}
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -768,7 +767,6 @@ int main(
		goto cleanup;
		}
		#endif
		#endif
		#endif
		}

lib_rend/ivas_reverb_filter_design_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -839,7 +839,7 @@ void ivas_reverb_calc_color_levels_fx(
		}

		/-------------------------------------------------------------------
		* ivas_reverb_interpolate_acoustic_data()
		* ivas_reverb_interpolate_acoustic_data_fx()
		*
		* Interpolates data from the input T60 and DSR tables to the FFT pFilter uniform grid
		* Note: the fc frequencies both for the input and the output must be in the ascending order

lib_rend/ivas_reverb_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1257,7 +1257,7 @@ static void set_fft_and_datablock_sizes_fx(
		}

		/-----------------------------------------------------------------------------------------
		* Function set_reverb_acoustic_data()
		* Function set_reverb_acoustic_data_fx()
		*
		* Sets reverb acoustic data (room acoustics and HRTF), interpolating it to the filter grid
		-----------------------------------------------------------------------------------------/
		@@ -1557,7 +1557,7 @@ ivas_error ivas_reverb_open_fx(
		test();

		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		set_reverb_acoustic_data( &params, &hRenderConfig->roomAcoustics, nr_fc_input, nr_fc_fft_filter );
		set_reverb_acoustic_data_fx( &params, &hRenderConfig->roomAcoustics, nr_fc_input, nr_fc_fft_filter );
		params.pHrtf_avg_pwr_response_l_const_fx = hHrtfStatistics->average_energy_l;
		params.pHrtf_avg_pwr_response_r_const_fx = hHrtfStatistics->average_energy_r;
		params.pHrtf_inter_aural_coherence_const_fx = hHrtfStatistics->inter_aural_coherence;

lib_rend/ivas_reverb_utils_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ static ivas_error ivas_reverb_get_fastconv_hrtf_set_energies(
		#endif

		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		ivas_reverb_interpolate_acoustic_data( avg_pwr_len, input_fc, avg_pwr_l, avg_pwr_r, CLDFB_NO_CHANNELS_MAX, output_fc, avg_pwr_left, avg_pwr_right );
		ivas_reverb_interpolate_acoustic_data_fx( avg_pwr_len, input_fc, avg_pwr_l, avg_pwr_r, CLDFB_NO_CHANNELS_MAX, output_fc, avg_pwr_left, avg_pwr_right );
		#else

		if ( ( error = ivas_reverb_get_cldfb_hrtf_set_properties( input_audio_config, hHrtfFastConv, use_brir, sampling_rate, avg_pwr_left_fft, avg_pwr_right_fft ) ) != IVAS_ERR_OK )

lib_rend/lib_rend.c

+14 −44

Original line number	Diff line number	Diff line
		@@ -1638,7 +1638,7 @@ static ivas_error setRendInputActiveIsm(
		IF( EQ_16( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IF( NE_32( ( error = ivas_reverb_open( &( inputIsm->hReverb ), hrtfs->hHrtfStatistics, hRendCfg, *rendCtx.pOutSampleRate ) ) IVAS_ERR_OK ) )
		IF( NE_32( ( error = ivas_reverb_open_fx( &( inputIsm->hReverb ), hrtfs->hHrtfStatistics, hRendCfg, *rendCtx.pOutSampleRate ) ) IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_reverb_open_fx( &( inputIsm->hReverb ), outConfig, NULL, inputIsm->tdRendWrapper.hBinRendererTd->HrFiltSet_p->lr_energy_and_iac_fx, hRendCfg, *rendCtx.pOutSampleRate ) ), IVAS_ERR_OK ) )
		#endif
		@@ -2679,7 +2679,7 @@ static ivas_error initMcBinauralRendering(
		IF( EQ_32( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) && inputMc->hReverb == NULL )
		{
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IF( NE_32( ( error = ivas_reverb_open( &( inputMc->hReverb ), hHrtfStatistics, hRendCfg, outSampleRate ) ), IVAS_ERR_OK ) )
		IF( NE_32( ( error = ivas_reverb_open_fx( &( inputMc->hReverb ), hHrtfStatistics, hRendCfg, outSampleRate ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_reverb_open_fx( &( inputMc->hReverb ), outConfig, NULL, inputMc->tdRendWrapper.hBinRendererTd->HrFiltSet_p->lr_energy_and_iac_fx, hRendCfg, outSampleRate ) ), IVAS_ERR_OK ) )
		#endif
		@@ -2936,10 +2936,7 @@ static ivas_error setRendInputActiveMc(
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IF( NE_32( ( error = initMcBinauralRendering( inputMc, inConfig, outConfig, hRendCfg, hrtfs->hSetOfHRTF, hrtfs->hHrtfStatistics, FALSE ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = initMcBinauralRendering( inputMc, inConfig, outConfig, hRendCfg,
		hrtfs->hSetOfHRTF,
		FALSE ) ),
		IVAS_ERR_OK ) )
		IF( NE_32( ( error = initMcBinauralRendering( inputMc, inConfig, outConfig, hRendCfg, hrtfs->hSetOfHRTF, FALSE ) ), IVAS_ERR_OK ) )
		#endif
		{
		return error;
		@@ -4326,9 +4323,10 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout(
		IF( EQ_16( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL ) \|\| EQ_16( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) \|\| EQ_16( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		#endif
		{
		IF( NE_32( ( error = initMcBinauralRendering( inputMc, inputMc->base.inConfig, hIvasRend->outputConfig, hIvasRend->hRendererConfig, hIvasRend->hHrtfs.hSetOfHRTF, FALSE ) ), IVAS_ERR_OK ) )
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IF( NE_32( ( error = initMcBinauralRendering( inputMc, inputMc->base.inConfig, hIvasRend->outputConfig, hIvasRend->hRendererConfig, hIvasRend->hHrtfs.hSetOfHRTF, hIvasRend->hHrtfs.hHrtfStatistics, FALSE ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = initMcBinauralRendering( inputMc, inputMc->base.inConfig, hIvasRend->outputConfig, hIvasRend->hRendererConfig, hIvasRend->hHrtfs.hSetOfHRTF, FALSE ) ), IVAS_ERR_OK ) )
		#endif
		{
		return error;
		@@ -5160,25 +5158,11 @@ ivas_error IVAS_REND_SetHeadRotation(
		{
		IF( NE_32( hIvasRend->inputsMc[i].base.inConfig, IVAS_AUDIO_CONFIG_INVALID ) )
		{
		IF( NE_32( ( error = initMcBinauralRendering( &hIvasRend->inputsMc[i],
		hIvasRend->inputsMc[i].base.inConfig,
		hIvasRend->outputConfig,
		hIvasRend->hRendererConfig,
		hIvasRend->hHrtfs.hSetOfHRTF,
		TRUE ) ),
		IVAS_ERR_OK ) )
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

		IF( NE_32( ( error = initMcBinauralRendering( &hIvasRend->inputsMc[i],
		hIvasRend->inputsMc[i].base.inConfig,
		hIvasRend->outputConfig,
		hIvasRend->hRendererConfig,
		hIvasRend->hHrtfs.hSetOfHRTF,
		hIvasRend->hHrtfs.hHrtfStatistics,
		TRUE ) ),
		IVAS_ERR_OK ) )
		IF( NE_32( ( error = initMcBinauralRendering( &hIvasRend->inputsMc[i], hIvasRend->inputsMc[i].base.inConfig, hIvasRend->outputConfig, hIvasRend->hRendererConfig, hIvasRend->hHrtfs.hSetOfHRTF, hIvasRend->hHrtfs.hHrtfStatistics, TRUE ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = initMcBinauralRendering( &hIvasRend->inputsMc[i], hIvasRend->inputsMc[i].base.inConfig, hIvasRend->outputConfig, hIvasRend->hRendererConfig, hIvasRend->hHrtfs.hSetOfHRTF, TRUE ) ), IVAS_ERR_OK ) )
		#endif

		{
		return error;
		}
		@@ -5282,25 +5266,11 @@ ivas_error IVAS_REND_DisableHeadRotation(
		{
		IF( NE_32( hIvasRend->inputsMc[i].base.inConfig, IVAS_AUDIO_CONFIG_INVALID ) )
		{
		IF( NE_32( ( error = initMcBinauralRendering( &hIvasRend->inputsMc[i],
		hIvasRend->inputsMc[i].base.inConfig,
		hIvasRend->outputConfig,
		hIvasRend->hRendererConfig,
		hIvasRend->hHrtfs.hSetOfHRTF,
		TRUE ) ),
		IVAS_ERR_OK ) )
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IF( NE_32( ( error = initMcBinauralRendering( &hIvasRend->inputsMc[i],
		hIvasRend->inputsMc[i].base.inConfig,
		hIvasRend->outputConfig,
		hIvasRend->hRendererConfig,
		hIvasRend->hHrtfs.hSetOfHRTF,
		hIvasRend->hHrtfs.hHrtfStatistics,
		TRUE ) ),
		IVAS_ERR_OK ) )
		IF( NE_32( ( error = initMcBinauralRendering( &hIvasRend->inputsMc[i], hIvasRend->inputsMc[i].base.inConfig, hIvasRend->outputConfig, hIvasRend->hRendererConfig, hIvasRend->hHrtfs.hSetOfHRTF, hIvasRend->hHrtfs.hHrtfStatistics, TRUE ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = initMcBinauralRendering( &hIvasRend->inputsMc[i], hIvasRend->inputsMc[i].base.inConfig, hIvasRend->outputConfig, hIvasRend->hRendererConfig, hIvasRend->hHrtfs.hSetOfHRTF, TRUE ) ), IVAS_ERR_OK ) )
		#endif


		{

		return error;