fixing some compile problems (a1e79477) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2214,7 +2214,7 @@ static ivas_error decodeG192(
		{
		#endif
		error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender,
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		IVAS_DEC_PCM_INT16,
		(void *)
		#endif
		@@ -2474,7 +2474,7 @@ static ivas_error decodeG192(

		/* decode and get samples */
		if ( ( error = IVAS_DEC_Flush( hIvasDec, nOutSamples,
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		IVAS_DEC_PCM_INT16,
		(void *)
		#endif
		@@ -3445,7 +3445,7 @@ static ivas_error decodeVoIP(

		/* decode and get samples */
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples,
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		IVAS_DEC_PCM_INT16,
		(void *)
		#endif

apps/renderer.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -1867,7 +1867,7 @@ int main(
		}
		#endif

		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		if ( args.inConfig.numBinBuses != 0 )
		{
		if ( ( error = IVAS_REND_GetSplitBinauralSamples( hIvasRend, outBuffer, &splitBinNeedsNewFrame ) ) != IVAS_ERR_OK )
		@@ -1904,7 +1904,7 @@ int main(
		#endif
		exit( -1 );
		}
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		}
		#endif

		@@ -2083,8 +2083,8 @@ int main(
		/* add zeros at the end to have equal length of synthesized signals */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( audioWriter != NULL )
		{
		#endif
		{
		#ifdef API_5MS
		int16_t zerosPadded = 0;
		zeroPad *= outBuffer.config.numChannels;
		@@ -2107,9 +2107,7 @@ int main(
		exit( -1 );
		}
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		}
		#endif

		#ifdef FIX_488_SYNC_DELAY
		if ( args.inConfig.numAudioObjects != 0 && ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL \|\| args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

lib_com/ivas_cnst.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ typedef enum
		} RENDERER_TYPE;


		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		typedef enum
		{
		PCM_INT16,

lib_com/ivas_prot.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ void stereo_dmx_evs_close_encoder(
		#if !defined(API_5MS) \|\| defined (API_5MS_BASELINE)
		ivas_error ivas_dec(
		Decoder_Struct st_ivas, / i : IVAS decoder structure */
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else
		@@ -330,7 +330,7 @@ ivas_error ivas_dec_init_split_rend(
		ivas_error ivas_dec_setup(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		uint16_t nSamplesRendered, / o : number of samples flushed from the previous frame (JBM) */
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else
		@@ -675,7 +675,7 @@ ivas_error ivas_mc_dec_config(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t idx, /* i : LS config. index */
		uint16_t nSamplesRendered, / o : samples flushed from last frame (JBM) */
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else
		@@ -795,7 +795,7 @@ ivas_error ivas_jbm_dec_render(
		const uint16_t nSamplesAsked, /* i : number of samples wanted */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		uint16_t nSamplesAvailableNext, / o : number of samples still available in the rendering pipeline */
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else
		@@ -812,7 +812,7 @@ ivas_error ivas_jbm_dec_flush_renderer(
		const MC_MODE mc_mode_old, /* i : old MC mode */
		const ISM_MODE ism_mode_old, /* i : old ISM mode */
		uint16_t nSamplesRendered, / o : number of samples flushed */
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else
		@@ -1105,7 +1105,7 @@ ivas_error ivas_ism_dec_config(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const ISM_MODE last_ism_mode, /* i/o: last ISM mode */
		uint16_t nSamplesRendered, / o : number of samples flushed on renderer change*/
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else

lib_dec/ivas_dec.c

+10 −8

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@

		ivas_error ivas_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else
		@@ -106,7 +106,7 @@ ivas_error ivas_dec(
		if ( st_ivas->bfi == 0 )
		{
		if ( ( error = ivas_dec_setup( st_ivas, NULL,
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		PCM_NOT_KNOW,
		#endif
		NULL ) ) != IVAS_ERR_OK )
		@@ -1079,7 +1079,7 @@ ivas_error ivas_dec(
		#endif
		{
		ivas_limiter_dec( st_ivas->hLimiter, p_output,
		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		nchan_out_syn_output,
		#else
		nchan_out,
		@@ -1087,7 +1087,7 @@ ivas_error ivas_dec(
		output_frame, st_ivas->BER_detect );
		}

		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		switch ( pcm_resolution )
		{
		case PCM_INT16:
		@@ -1096,15 +1096,17 @@ ivas_error ivas_dec(
		st_ivas->noClipping +=
		#endif
		ivas_syn_output( p_output, output_frame,
		#ifdef API_5MS
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		nchan_out_syn_output,
		(int16_t *)
		#else
		nchan_out,
		#endif
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		(int16_t *)
		#endif
		data );

		#ifdef API_5MS
		#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT
		break;
		case PCM_FLOAT32:
		ivas_syn_output_f( p_output, output_frame, nchan_out_syn_output, (float *) data );