[cleanup] accept FIX_VOIP_FUNCTIONS (766c0b5a) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -566,15 +566,11 @@ int main(
		}
		}
		#else
		#ifdef FIX_VOIP_FUNCTIONS
		if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg.voipMode ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#else
		IVAS_DEC_PrintConfig( hIvasDec, 1, arg.voipMode );
		#endif
		#endif

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

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -159,7 +159,6 @@
		#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		#define FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */
		#define FIX_VOIP_FUNCTIONS /* VA: fix data type mismatch in IVAS_DEC_VoIP_SetScale() + add sanity checks to API functions */
		#define FIX_1298_MEMORY_OPT_IVAS_CORE_ENC /* VA: issue 1298: Memory saving in ivas_core_enc() */
		#define FIX_587_DEFAULT_REVERB /* Philips: issue 587: inconsistent default reverb parameters across renderers */
		#define NONBE_1214_PLC_LSF_MEMORY /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */

lib_dec/lib_dec.c

+0 −32

Original line number	Diff line number	Diff line
		@@ -1080,12 +1080,10 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
		int16_t ro_md_flag;
		IVAS_QUATERNION Quaternion;

		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}
		#endif

		error = IVAS_ERR_OK;
		st_ivas = hIvasDec->st_ivas;
		@@ -1517,13 +1515,11 @@ ivas_error IVAS_DEC_GetFormat(
		IVAS_DEC_BS_FORMAT format / o : format detected from bitstream fed to the decoder */
		)
		{
		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#endif
		if ( hIvasDec->hasDecodedFirstGoodFrame )
		{
		*format = mapIvasFormat( hIvasDec->st_ivas->ivas_format );
		@@ -1617,13 +1613,11 @@ ivas_error IVAS_DEC_GetNumOutputChannels(
		int16_t numOutputChannels / o : number of PCM output channels */
		)
		{
		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#endif
		if ( hIvasDec->hasDecodedFirstGoodFrame )
		{
		*numOutputChannels = hIvasDec->st_ivas->hDecoderConfig->nchan_out;
		@@ -2456,13 +2450,11 @@ ivas_error IVAS_DEC_VoIP_FeedFrame(
		int16_t partialCopyFrameType, partialCopyOffset;
		int16_t result;

		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->hVoIP == NULL \|\| au == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#endif
		if ( auSize == 0 )
		{
		return IVAS_ERR_OK; /* ignore empty/NO_DATA frame - shouldn't be transmitted in RTP */
		@@ -2541,12 +2533,10 @@ ivas_error IVAS_DEC_VoIP_SetScale(
		const int16_t scale /* i : TSM scale to set in percent of the default frame size */
		)
		{
		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}
		#endif

		if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm == false )
		{
		@@ -2580,13 +2570,11 @@ ivas_error IVAS_DEC_TSM_SetQuality(
		const float quality /* i : target TSM quality */
		)
		{
		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#endif
		if ( !hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
		{
		return IVAS_ERR_TSM_NOT_ENABLED;
		@@ -2630,13 +2618,11 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
		int16_t nSamplesRendered;
		uint8_t nOutChannels;

		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL \|\| hIvasDec->hVoIP == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#endif
		st_ivas = hIvasDec->st_ivas;
		hDecoderConfig = st_ivas->hDecoderConfig;
		hVoIP = hIvasDec->hVoIP;
		@@ -2840,13 +2826,11 @@ ivas_error IVAS_DEC_Flush(
		uint16_t nSamplesToRender;
		uint16_t nSamplesFlushedLocal;

		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#endif
		*nSamplesFlushed = min( nSamplesPerChannel, hIvasDec->nSamplesAvailableNext );

		nSamplesToRender = (uint16_t) *nSamplesFlushed;
		@@ -2876,13 +2860,11 @@ bool IVAS_DEC_VoIP_IsEmpty(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const int16_t nSamplesAsked )
		{
		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->hVoIP == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#endif
		return ( ( JB4_bufferedDataUnits( hIvasDec->hVoIP->hJBM ) == 0 ) && ( hIvasDec->nSamplesAvailableNext < nSamplesAsked ) );
		}

		@@ -2988,11 +2970,7 @@ ivas_error IVAS_DEC_GetJbmData(
		IVAS_JBM_TRACE_DATA JbmTraceData / o : JBM Trace data */
		)
		{
		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->hVoIP == NULL \|\| JbmTraceData == NULL )
		#else
		if ( hIvasDec->hVoIP == NULL )
		#endif
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}
		@@ -3217,29 +3195,19 @@ static ivas_error printConfigInfo_dec(
		* Print decoder set-up info
		---------------------------------------------------------------------/

		#ifdef FIX_VOIP_FUNCTIONS
		ivas_error IVAS_DEC_PrintConfig(
		#else
		void IVAS_DEC_PrintConfig(
		#endif
		const IVAS_DEC_HANDLE hIvasDec,
		const bool quietModeEnabled,
		const bool voipMode )
		{
		#ifdef FIX_VOIP_FUNCTIONS
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#endif
		printConfigInfo_dec( hIvasDec->st_ivas, hIvasDec->bitstreamformat, voipMode, quietModeEnabled );

		#ifdef FIX_VOIP_FUNCTIONS
		return IVAS_ERR_OK;
		#else
		return;
		#endif
		}

lib_dec/lib_dec.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -483,11 +483,7 @@ const char *IVAS_DEC_GetErrorMessage(
		ivas_error error /* i : decoder error code enum */
		);

		#ifdef FIX_VOIP_FUNCTIONS
		ivas_error IVAS_DEC_PrintConfig(
		#else
		void IVAS_DEC_PrintConfig(
		#endif
		const IVAS_DEC_HANDLE hIvasDec, /* i : IVAS decoder handle */
		const bool quietModeEnabled, /* i : quiet mode flag: if true, reduces the amount of config info printed */
		const bool voipMode