renamed hRend to hRendCfg (7a1aa576) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_crend.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1148,7 +1148,7 @@ ivas_error ivas_rend_openCrend(
		CREND_WRAPPER *pCrend,
		IVAS_REND_AudioConfig inConfig,
		IVAS_REND_AudioConfig outConfig,
		RENDER_CONFIG_DATA *hRend,
		RENDER_CONFIG_DATA *hRendCfg,
		int32_t output_Fs )
		{
		/* TODO tmu : Based on ivas_crend_open() - could be harmonized / refactored */
		@@ -1163,7 +1163,7 @@ ivas_error ivas_rend_openCrend(

		if ( pCrend->hHrtfCrend == NULL )
		{
		if ( ( error = ivas_rend_initCrend( pCrend, inConfig, outConfig, hRend, output_Fs ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_rend_initCrend( pCrend, inConfig, outConfig, hRendCfg, output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -1277,12 +1277,12 @@ ivas_error ivas_rend_openCrend(
		hCrend->hTrack = NULL;
		}

		if ( ( hRend != NULL ) && (hRend->roomAcoustics.late_reverb_on ) )
		if ( ( hRendCfg != NULL ) && (hRendCfg->roomAcoustics.late_reverb_on ) )
		{
		if ( ( error = ivas_reverb_open( &(hCrend->hReverb),
		getIvasAudioConfigFromRendAudioConfig( inConfig ),
		pCrend->hHrtfCrend,
		hRend,
		hRendCfg,
		output_Fs
		) ) != IVAS_ERR_OK )
		{
		@@ -1311,7 +1311,7 @@ ivas_error ivas_rend_initCrend(
		CREND_WRAPPER *pCrend,
		IVAS_REND_AudioConfig inConfig,
		IVAS_REND_AudioConfig outConfig,
		RENDER_CONFIG_DATA *hRend,
		RENDER_CONFIG_DATA *hRendCfg,
		int32_t output_Fs )
		{
		int16_t i, j, tmp;
		@@ -1343,7 +1343,7 @@ ivas_error ivas_rend_initCrend(

		/* set BRIR flag */
		use_brir = false;
		if ( (hRend != NULL && hRend->roomAcoustics.use_brir ) \|\| outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
		if ( (hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir ) \|\| outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
		{
		use_brir = true;
		}

lib_rend/lib_rend.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -886,7 +886,7 @@ static ivas_error setRendInputActiveIsm(
		void *input,
		IVAS_REND_AudioConfig inConfig,
		IVAS_REND_InputId id,
		RENDER_CONFIG_DATA *hRend )
		RENDER_CONFIG_DATA *hRendCfg )
		{
		ivas_error error;
		rendering_context rendCtx;
		@@ -918,7 +918,7 @@ static ivas_error setRendInputActiveIsm(
		error = ivas_rend_openCrend( &inputIsm->crendWrapper,
		IVAS_REND_AUDIO_CONFIG_7_1_4,
		outConfig,
		hRend,
		hRendCfg,
		*rendCtx.pOutSampleRate );
		}
		if ( error != IVAS_ERR_OK )
		@@ -1429,7 +1429,7 @@ static ivas_error initMcBinauralRendering(
		input_mc *inputMc,
		IVAS_REND_AudioConfig inConfig,
		IVAS_REND_AudioConfig outConfig,
		RENDER_CONFIG_DATA *hRend )
		RENDER_CONFIG_DATA *hRendCfg )
		{
		ivas_error error;
		int32_t outSampleRate;
		@@ -1481,7 +1481,7 @@ static ivas_error initMcBinauralRendering(
		if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper,
		( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? IVAS_REND_AUDIO_CONFIG_7_1_4 : inConfig,
		outConfig,
		hRend,
		hRendCfg,
		outSampleRate ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1550,7 +1550,7 @@ static ivas_error setRendInputActiveMc(
		void *input,
		IVAS_REND_AudioConfig inConfig,
		IVAS_REND_InputId id,
		RENDER_CONFIG_DATA *hRend )
		RENDER_CONFIG_DATA *hRendCfg )
		{
		ivas_error error;
		rendering_context rendCtx;
		@@ -1574,7 +1574,7 @@ static ivas_error setRendInputActiveMc(

		if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL \|\| outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
		{
		if ( ( error = initMcBinauralRendering( inputMc, inConfig, outConfig, hRend ) ) != IVAS_ERR_OK )
		if ( ( error = initMcBinauralRendering( inputMc, inConfig, outConfig, hRendCfg ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -1698,7 +1698,7 @@ static ivas_error initSbaPanGainsForSbaOut( input_sba *inputSba, IVAS_REND_Audio
		return error;
		}

		static ivas_error updateSbaPanGains( input_sba inputSba, IVAS_REND_AudioConfig outConfig, RENDER_CONFIG_DATA hRend )
		static ivas_error updateSbaPanGains( input_sba inputSba, IVAS_REND_AudioConfig outConfig, RENDER_CONFIG_DATA hRendCfg )
		{
		ivas_error error;
		IVAS_REND_AudioConfig inConfig;
		@@ -1725,7 +1725,7 @@ static ivas_error updateSbaPanGains( input_sba *inputSba, IVAS_REND_AudioConfig
		error = ivas_rend_openCrend( &inputSba->crendWrapper,
		inConfig,
		outConfig,
		hRend,
		hRendCfg,
		*rendCtx.pOutSampleRate );
		break;
		case IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM:
		@@ -1736,7 +1736,7 @@ static ivas_error updateSbaPanGains( input_sba *inputSba, IVAS_REND_AudioConfig
		error = ivas_rend_openCrend( &inputSba->crendWrapper,
		IVAS_REND_AUDIO_CONFIG_7_1_4,
		outConfig,
		hRend,
		hRendCfg,
		*rendCtx.pOutSampleRate );
		break;
		default:
		@@ -1759,7 +1759,7 @@ static ivas_error setRendInputActiveSba(
		void *input,
		IVAS_REND_AudioConfig inConfig,
		IVAS_REND_InputId id,
		RENDER_CONFIG_DATA *hRend )
		RENDER_CONFIG_DATA *hRendCfg )
		{
		ivas_error error;
		rendering_context rendCtx;
		@@ -1775,7 +1775,7 @@ static ivas_error setRendInputActiveSba(
		inputSba->crendWrapper = defaultCrendWrapper();
		initRotGains( inputSba->rot_gains_prev );

		if ( ( error = updateSbaPanGains( inputSba, outConfig, hRend ) ) != IVAS_ERR_OK )
		if ( ( error = updateSbaPanGains( inputSba, outConfig, hRendCfg ) ) != IVAS_ERR_OK )
		{
		return error;
		}