clang-format (f9192357) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_prot_rend.h

+7 −9

Original line number	Diff line number	Diff line
		@@ -153,7 +153,6 @@ ivas_error ivas_sba_get_hoa_dec_matrix(
		const int16_t ambisonics_order /* i : Ambisonics order */
		);


		void ivas_dirac_dec_binaural_sba_gain(
		#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP
		float output[], / i/o: synthesized core-coder transport channels/DirAC output */
		@@ -489,7 +488,7 @@ void ivas_dirac_dec_get_frequency_axis(
		);

		ivas_error ivas_spat_hSpatParamRendCom_config(
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom_out, / i/o: IVAS decoder structure */
		SPAT_PARAM_REND_COMMON_DATA_HANDLE *hSpatParamRendCom_out,
		const DIRAC_CONFIG_FLAG flag_config_inp, /* i/ : Flag determining if we open or reconfigure the DirAC decoder */
		const int16_t dec_param_estim_flag,
		const IVAS_FORMAT ivas_format,
		@@ -624,7 +623,6 @@ void ivas_td_binaural_close(
		BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd / i/o: TD binaural object renderer handle */
		);


		ivas_error TDREND_GetMix(
		BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
		float output[], / i/o: ISM object synth / rendered output in 0,1 */
		@@ -1025,7 +1023,7 @@ ivas_error ivas_reverb_open(
		REVERB_HANDLE hReverb, / i/o: Reverberator handle */
		const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */
		const HRTFS_HANDLE hHrtf, /* i : HRTF handle */
		const float lr_energy_and_iac[], / precomuputed lr energies and iac*/
		const float lr_energy_and_iac[], / i : precomuputed lr energies and iac */
		RENDER_CONFIG_DATA pConfig, / i : Reverb configuration */
		const int32_t output_Fs /* i : output sampling rate */
		);

lib_rend/lib_rend.c

+6 −14

Original line number	Diff line number	Diff line
		@@ -2169,11 +2169,7 @@ static ivas_error initMcBinauralRendering(
		/* Open TD renderer wrappers */
		for ( i = 0; i < MAX_HEAD_ROT_POSES - 1; ++i )
		{
		if ( ( error = ivas_td_binaural_open_ext( &inputMc->splitTdRendWrappers[i],
		inConfig,
		hRendCfg,
		&inputMc->customLsInput,
		outSampleRate ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_td_binaural_open_ext( &inputMc->splitTdRendWrappers[i], inConfig, hRendCfg, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2187,9 +2183,6 @@ static ivas_error initMcBinauralRendering(
		if ( outConfig == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = ivas_reverb_open( &( inputMc->hReverb ), outConfig, NULL, inputMc->tdRendWrapper.hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, hRendCfg, outSampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_reverb_open( &( inputMc->hReverb ), outConfig, NULL, hRendCfg, outSampleRate ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -2218,8 +2211,7 @@ static ivas_error initMcBinauralRendering(
		}

		/* determine binaural delay ( used for aligning LFE to output signal ) */
		binauralDelayNs = max( ( inputMc->crendWrapper != NULL ) ? inputMc->crendWrapper->binaural_latency_ns : 0,
		inputMc->tdRendWrapper.binaural_latency_ns );
		binauralDelayNs = max( ( inputMc->crendWrapper != NULL ) ? inputMc->crendWrapper->binaural_latency_ns : 0, inputMc->tdRendWrapper.binaural_latency_ns );
		inputMc->binauralDelaySmp = (int16_t) roundf( (float) binauralDelayNs * *inputMc->base.ctx.pOutSampleRate / 1000000000.f );

		if ( inputMc->binauralDelaySmp > MAX_BIN_DELAY_SAMPLES )