apply clang-format (1577f8d8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_enc/ivas_decision_matrix_enc.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,6 @@ void ivas_decision_matrix_enc(
		/* select TCX core or HQ core using bits_frame_nominal to match the TCX configuration bitrate */
		st->core = mdct_classifier( st, fft_buff, enerBuffer, st->bits_frame_nominal * FRAMES_PER_SEC );
		}

		}

		/* do not allow TD stereo ACELP core -> DFT stereo TCX core switching as it is on the WC complexity path */

lib_enc/ivas_mc_param_enc.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -489,7 +489,6 @@ void ivas_param_mc_enc(
		{
		hParamMC->hMetadataPMC.attackIndex = 0;
		}

		}
		break;
		#ifdef DEBUGGING

lib_rend/lib_rend.c

+30 −61

Original line number	Diff line number	Diff line
		@@ -1201,11 +1201,9 @@ static void initRendInputBase(
		input_base *inputBase,
		const IVAS_REND_AudioConfig inConfig,
		const IVAS_REND_InputId id,
		const rendering_context rendCtx
		,
		const rendering_context rendCtx,
		float *dataBuf,
		const int16_t dataBufSize
		)
		const int16_t dataBufSize )
		{
		inputBase->inConfig = inConfig;
		inputBase->id = id;
		@@ -1363,10 +1361,8 @@ static ivas_error setRendInputActiveIsm(
		{
		return error;
		}
		initRendInputBase( &inputIsm->base, inConfig, id, rendCtx
		,
		inputIsm->bufferData, MAX_BUFFER_LENGTH
		);
		initRendInputBase( &inputIsm->base, inConfig, id, rendCtx,
		inputIsm->bufferData, MAX_BUFFER_LENGTH );

		inputIsm->currentPos = defaultObjectPosition();
		inputIsm->previousPos = defaultObjectPosition();
		@@ -1467,10 +1463,8 @@ static void clearInputIsm(
		rendCtx = inputIsm->base.ctx;

		freeInputBaseBufferData( &inputIsm->base.inputBuffer.data );
		initRendInputBase( &inputIsm->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx
		,
		NULL, 0
		);
		initRendInputBase( &inputIsm->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx,
		NULL, 0 );

		/* Free input's internal handles */

		@@ -2377,10 +2371,8 @@ static ivas_error setRendInputActiveMc(
		{
		return error;
		}
		initRendInputBase( &inputMc->base, inConfig, id, rendCtx
		,
		inputMc->bufferData, MAX_BUFFER_LENGTH
		);
		initRendInputBase( &inputMc->base, inConfig, id, rendCtx,
		inputMc->bufferData, MAX_BUFFER_LENGTH );
		setZeroPanMatrix( inputMc->panGains );
		inputMc->customLsInput = defaultCustomLs();
		inputMc->tdRendWrapper = defaultTdRendWrapper();
		@@ -2434,10 +2426,8 @@ static void clearInputMc(
		rendCtx = inputMc->base.ctx;

		freeInputBaseBufferData( &inputMc->bufferData );
		initRendInputBase( &inputMc->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx
		,
		NULL, 0
		);
		initRendInputBase( &inputMc->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx,
		NULL, 0 );

		/* Free input's internal handles */
		if ( inputMc->efapInWrapper.hEfap != NULL )
		@@ -2738,10 +2728,8 @@ static ivas_error setRendInputActiveSplitPostRend(
		{
		return error;
		}
		initRendInputBase( &inputSplitPostRend->base, inConfig, id, rendCtx
		,
		inputSplitPostRend->bufferData, MAX_BIN_BUFFER_LENGTH
		);
		initRendInputBase( &inputSplitPostRend->base, inConfig, id, rendCtx,
		inputSplitPostRend->bufferData, MAX_BIN_BUFFER_LENGTH );

		if ( ( error = updateSplitPostRendPanGains( inputSplitPostRend, outConfig, hRendCfg ) ) != IVAS_ERR_OK )
		{
		@@ -2846,10 +2834,8 @@ static void clearInputSplitRend(
		rendCtx = inputSplitRend->base.ctx;

		freeInputBaseBufferData( &inputSplitRend->bufferData );
		initRendInputBase( &inputSplitRend->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx
		,
		NULL, 0
		);
		initRendInputBase( &inputSplitRend->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx,
		NULL, 0 );
		if ( inputSplitRend->splitPostRendWrapper.hBinHrSplitPostRend != NULL )
		{
		ivas_splitBinPostRendClose( &inputSplitRend->splitPostRendWrapper.hBinHrSplitPostRend );
		@@ -2875,10 +2861,8 @@ static void clearInputSba(
		rendCtx = inputSba->base.ctx;

		freeInputBaseBufferData( &inputSba->bufferData );
		initRendInputBase( &inputSba->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx
		,
		NULL, 0
		);
		initRendInputBase( &inputSba->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx,
		NULL, 0 );

		/* Free input's internal handles */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		@@ -3286,10 +3270,8 @@ static ivas_error setRendInputActiveMasa(
		{
		return error;
		}
		initRendInputBase( &inputMasa->base, inConfig, id, rendCtx
		,
		inputMasa->bufferData, MAX_BUFFER_LENGTH
		);
		initRendInputBase( &inputMasa->base, inConfig, id, rendCtx,
		inputMasa->bufferData, MAX_BUFFER_LENGTH );

		if ( ( error = getAudioConfigNumChannels( inConfig, &numInChannels ) ) != IVAS_ERR_OK )
		{
		@@ -3413,10 +3395,8 @@ static void clearInputMasa(
		freeInputBaseBufferData( &inputMasa->bufferData );

		masaPrerendClose( &inputMasa->hMasaPrerend );
		initRendInputBase( &inputMasa->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx
		,
		NULL, 0
		);
		initRendInputBase( &inputMasa->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx,
		NULL, 0 );
		freeDecoderDummy( &inputMasa->decDummy );

		return;
		@@ -3567,10 +3547,8 @@ ivas_error IVAS_REND_Open(

		for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		{
		initRendInputBase( &hIvasRend->inputsIsm[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend )
		,
		NULL, 0
		);
		initRendInputBase( &hIvasRend->inputsIsm[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ),
		NULL, 0 );
		hIvasRend->inputsIsm[i].crendWrapper = NULL;
		hIvasRend->inputsIsm[i].hReverb = NULL;
		hIvasRend->inputsIsm[i].tdRendWrapper.hBinRendererTd = NULL;
		@@ -3589,10 +3567,8 @@ ivas_error IVAS_REND_Open(

		for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
		{
		initRendInputBase( &hIvasRend->inputsMc[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend )
		,
		NULL, 0
		);
		initRendInputBase( &hIvasRend->inputsMc[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ),
		NULL, 0 );
		hIvasRend->inputsMc[i].efapInWrapper.hEfap = NULL;
		hIvasRend->inputsMc[i].crendWrapper = NULL;
		hIvasRend->inputsMc[i].hReverb = NULL;
		@@ -3612,10 +3588,8 @@ ivas_error IVAS_REND_Open(

		for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )
		{
		initRendInputBase( &hIvasRend->inputsSba[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend )
		,
		NULL, 0
		);
		initRendInputBase( &hIvasRend->inputsSba[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ),
		NULL, 0 );
		hIvasRend->inputsSba[i].crendWrapper = NULL;
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		hIvasRend->inputsSba[i].cldfbRendWrapper.hCldfbRend = NULL;
		@@ -3627,10 +3601,8 @@ ivas_error IVAS_REND_Open(

		for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )
		{
		initRendInputBase( &hIvasRend->inputsMasa[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend )
		,
		NULL, 0
		);
		initRendInputBase( &hIvasRend->inputsMasa[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ),
		NULL, 0 );
		hIvasRend->inputsMasa[i].decDummy = NULL;
		hIvasRend->inputsMasa[i].metadataHasBeenFed = false;
		hIvasRend->inputsMasa[i].bufferData = NULL;
		@@ -3642,16 +3614,13 @@ ivas_error IVAS_REND_Open(
		initRendInputBase( &hIvasRend->inputsSplitPost[i].base,
		IVAS_REND_AUDIO_CONFIG_UNKNOWN,
		0,
		getRendCtx( hIvasRend )
		,
		NULL, 0
		);
		getRendCtx( hIvasRend ),
		NULL, 0 );
		ivas_init_split_post_rend_handles( &hIvasRend->inputsSplitPost[i].splitPostRendWrapper );
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		hIvasRend->splitRendBFI = 0;
		#endif
		hIvasRend->inputsSplitPost[i].bufferData = NULL;

		}
		#endif