harmonize handle/parameter name (39bb0e61) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_stat_dec.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1051,7 +1051,7 @@ typedef struct ivas_binaural_rendering_struct
		/* Convolution module structure */
		BINRENDERER_CONV_MODULE_HANDLE hBinRenConvModule;

		/* Variables related to reverb module */
		/* Variables related to reverberator module */
		float earlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];
		REVERB_STRUCT_HANDLE hReverb;

lib_rend/ivas_objectRenderer.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -267,10 +267,10 @@ void ivas_td_binaural_close(
		---------------------------------------------------------------------/

		ivas_error ivas_td_binaural_renderer_unwrap(
		const REVERB_HANDLE hReverb, /* i : reverb handle */
		const REVERB_HANDLE hReverb, /* i : Reverberator handle */
		const AUDIO_CONFIG transport_config, /* i : Transport configuration */
		BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD binaural object renderer handle */
		const int16_t nchan_transport, /* i : Transport channels (ISMs) */
		const int16_t num_src, /* i : number of sources to render */
		const int16_t lfe_idx, /* i : LFE channel index */
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		ISM_METADATA_HANDLE hIsmMetaData, / i : ISM metadata handle */
		@@ -291,7 +291,7 @@ ivas_error ivas_td_binaural_renderer_unwrap(
		subframe_length = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES;

		/* Update object position(s) */
		TDREND_Update_object_positions( hBinRendererTd, nchan_transport, lfe_idx, ivas_format, hIsmMetaData, output );
		TDREND_Update_object_positions( hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, output );

		for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ )
		{
		@@ -302,7 +302,7 @@ ivas_error ivas_td_binaural_renderer_unwrap(
		TDREND_Update_listener_orientation( hBinRendererTd, Opt_Headrotation, ( Quaternions != NULL ) ? &Quaternions[subframe_idx] : NULL );
		#endif

		if ( ( hReverb != NULL ) && ( hReverb->pConfig.roomAcoustics.late_reverb_on ) )
		if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on )
		{
		if ( ( error = ivas_reverb_process( hReverb, transport_config, 0, output, reverb_signal, subframe_idx ) ) != IVAS_ERR_OK )
		{
		@@ -318,7 +318,7 @@ ivas_error ivas_td_binaural_renderer_unwrap(
		}


		if ( ( hReverb != NULL ) && ( hReverb->pConfig.roomAcoustics.late_reverb_on ) )
		if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on )
		{
		/* add reverb to rendered signals */
		v_add( reverb_signal[0], output[0], output[0], output_frame );
		@@ -426,7 +426,7 @@ static void TDREND_Clear_Update_flags(

		void TDREND_Update_object_positions(
		BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o : TD Renderer handle */
		const int16_t numSources, /* i : Number of sources to render */
		const int16_t num_src, /* i : number of sources to render */
		const int16_t lfe_idx, /* i : Input LFE index */
		const IVAS_FORMAT in_format, /* i : Format of input sources */
		const ISM_METADATA_HANDLE hIsmMetaData, / i : Input metadata for ISM objects */
		@@ -443,7 +443,7 @@ void TDREND_Update_object_positions(

		/* For each source, write the frame data to the source object*/
		c_indx = 0;
		for ( nS = 0; nS < numSources; nS++ )
		for ( nS = 0; nS < num_src; nS++ )
		{
		if ( !( in_format == MC_FORMAT && nS == lfe_idx ) ) /* Skip LFE for MC */
		{
		@@ -636,7 +636,7 @@ ivas_error ivas_td_binaural_renderer_ext(
		const LSSETUP_CUSTOM_STRUCT customLsInput, / i : Input custom loudspeaker layout */
		const IVAS_REND_HeadRotData headRotData, / i : Input head positions */
		const IVAS_REND_AudioObjectPosition currentPos, / i : Object position */
		const REVERB_HANDLE reverb, /* i : reverb handle */
		const REVERB_HANDLE hReverb, /* i : Reverberator handle */
		const int16_t output_frame, /* i : output frame length */
		float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */
		)
		@@ -688,7 +688,7 @@ ivas_error ivas_td_binaural_renderer_ext(
		#endif
		}

		if ( ( error = ivas_td_binaural_renderer_unwrap( reverb, transport_config, pTDRend->hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, headRotData->headRotEnabled,
		if ( ( error = ivas_td_binaural_renderer_unwrap( hReverb, transport_config, pTDRend->hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, headRotData->headRotEnabled,
		( headRotData != NULL ) ? headRotData->headPositions : NULL,
		#ifdef TD5
		( headRotData != NULL ) ? headRotData->Pos : NULL, output, output_frame ) ) != IVAS_ERR_OK )

lib_rend/ivas_prot_rend.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -212,10 +212,10 @@ void ivas_HRTF_CRend_binary_close(
		----------------------------------------------------------------------------------/

		ivas_error ivas_td_binaural_renderer_unwrap(
		const REVERB_HANDLE hReverb, /* i : reverb handle */
		const REVERB_HANDLE hReverb, /* i : Reverberator handle */
		const AUDIO_CONFIG transport_config, /* i : Transport configuration */
		BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD binaural object renderer handle */
		const int16_t nchan_transport, /* i : Transport channels (ISMs) */
		const int16_t num_src, /* i : number of sources to render */
		const int16_t lfe_idx, /* i : LFE channel index */
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		ISM_METADATA_HANDLE hIsmMetaData, / i : ISM metadata handle */
		@@ -234,7 +234,7 @@ ivas_error ivas_td_binaural_renderer_ext(
		const LSSETUP_CUSTOM_STRUCT customLsInput, / i : Input custom loudspeaker layout */
		const IVAS_REND_HeadRotData headRotData, / i : Input head positions */
		const IVAS_REND_AudioObjectPosition currentPos, / i : Object position */
		const REVERB_HANDLE reverb, /* i : reverb handle */
		const REVERB_HANDLE hReverb, /* i : Reverberator handle */
		const int16_t output_frame, /* i : output frame length */
		float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */
		);
		@@ -288,7 +288,7 @@ void TDREND_Update_listener_orientation(

		void TDREND_Update_object_positions(
		BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o : TD Renderer handle */
		const int16_t numSources, /* i : Number of sources to render */
		const int16_t num_src, /* i : number of sources to render */
		const int16_t lfe_idx, /* i : Input LFE index */
		const IVAS_FORMAT in_format, /* i : Format of input sources */
		const ISM_METADATA_HANDLE hIsmMetaData, / i : Input metadata for ISM objects */

lib_rend/lib_rend.c

+45 −87

File changed.

Preview size limit exceeded, changes collapsed.