fix Linux comppile and instrumentation problems, clang-format (43982584) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_error.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -86,6 +86,11 @@ typedef enum
		IVAS_ERR_ISM_INVALID_METADATA_VALUE,
		IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE,
		IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED,
		#ifdef API_5MS
		IVAS_ERR_TSM_NOT_ENABLED,
		IVAS_ERR_FETCH_SIZE_NO_MULTIPLE_OF_5MS,
		IVAS_ERR_NEED_NEW_FRAME,
		#endif
		#ifdef DEBUGGING
		IVAS_ERR_INVALID_FORCE_MODE,
		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		@@ -94,11 +99,6 @@ typedef enum
		#ifdef VARIABLE_SPEED_DECODING
		IVAS_ERR_VS_FRAME_NEEDED,
		#endif
		#ifdef API_5MS
		IVAS_ERR_TSM_NOT_ENABLED,
		IVAS_ERR_FETCH_SIZE_NO_MULTIPLE_OF_5MS,
		IVAS_ERR_NEED_NEW_FRAME,
		#endif
		#endif

		/----------------------------------------

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,6 @@
		#define FIX_558_PLC_DISCONT /* FhG: issue 558: fix discontinuities in DFT Stereo when switching from TCX concealment to ACELP */
		#define FIX_564 /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */
		#define FIX_566_2DIR_MASA_384K /* Nokia: Issued 566: Bugfix in 384k MASA metadata encoding of second direction */
		#define FIX_XXX_JITTER_SBA_BINAURAL_GAIN
		#define FIX_XXX_HEADTRACKER_INIT
		#define FIX_XXX_TDOBJRENDERER_INPUT
		#define FIX_XXX_ISM_SBA_ASAN

lib_dec/lib_dec.c

+9 −16

Original line number	Diff line number	Diff line
		@@ -837,7 +837,6 @@ ivas_error IVAS_DEC_GetSamples(
		bool needNewFrame / indication that the decoder needs a new frame */
		)
		{
		Decoder_Struct *st_ivas;
		ivas_error error;
		int16_t nOutSamplesElse, result, nSamplesToRender;
		uint16_t nSamplesRendered, nSamplesRendered_loop, l_ts, nTimeScalerOutSamples;
		@@ -850,7 +849,6 @@ ivas_error IVAS_DEC_GetSamples(
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}
		st_ivas = hIvasDec->st_ivas;

		if ( !hIvasDec->hasBeenFedFrame && hIvasDec->nSamplesAvailableNext == 0 )
		{
		@@ -2062,20 +2060,12 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
		DECODER_CONFIG_HANDLE hDecoderConfig;
		IVAS_DEC_VOIP *hVoIP;
		uint32_t extBufferedTime_ms, scale, maxScaling;
		#ifndef API_5MS
		uint16_t nTimeScalerOutSamples;
		#endif
		JB4_DATAUNIT_HANDLE dataUnit;
		#ifndef API_5MS
		int16_t nOutSamplesElse;
		#endif
		uint16_t extBufferedSamples;
		int16_t timeScalingDone;
		int16_t result;
		ivas_error error;
		int16_t nSamplesRendered;
		uint16_t nSamplesTcsScaled;
		uint8_t nTransportChannels;
		uint8_t nOutChannels;

		error = IVAS_ERR_OK;
		@@ -2086,8 +2076,6 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
		timeScalingDone = 0;

		nOutChannels = (uint8_t) st_ivas->hDecoderConfig->nchan_out;
		nTransportChannels = 0;
		nSamplesTcsScaled = hVoIP->nSamplesFrame;
		nSamplesRendered = 0;

		if ( nSamplesPerChannel == 0 )
		@@ -2625,8 +2613,8 @@ ivas_error IVAS_DEC_Flush(
		)
		{
		ivas_error error;
		IVAS_DEC_VOIP *hVoIP;
		#ifndef API_5MS
		IVAS_DEC_VOIP *hVoIP;
		int16_t rendererPcmBuf[( MAX_OUTPUT_CHANNELS * L_FRAME_MAX * APA_MAX_SCALE ) / 100];
		#endif
		uint16_t nSamplesToRender;
		@@ -2634,7 +2622,9 @@ ivas_error IVAS_DEC_Flush(

		error = IVAS_ERR_OK;

		#ifndef API_5MS
		hVoIP = hIvasDec->hVoIP;
		#endif
		#ifdef API_5MS
		*nSamplesFlushed = min( nSamplesPerChannel, hIvasDec->nSamplesAvailableNext );
		#else
		@@ -3533,15 +3523,18 @@ ivas_error IVAS_DEC_reconfigure(
		const uint16_t l_ts )
		{

		#ifndef API_5MS
		IVAS_DEC_VOIP *hVoIP;
		#endif
		#ifdef API_5MS
		int16_t apa_buffer_size;
		#endif

		ivas_error error;


		#ifndef API_5MS
		hVoIP = hIvasDec->hVoIP;
		#endif
		#ifdef API_5MS
		apa_buffer_size = hIvasDec->nSamplesFrame;
		#endif