Commit 9a231370 authored Jun 11, 2024 by Dominik Weckbecker

fix compile error with OBJ_EDITING_INTERFACE disabled

parent f73c6d35

apps/decoder.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3366,8 +3366,9 @@ static ivas_error decodeVoIP(
		#endif

		#ifdef SUPPORT_JBM_TRACEFILE
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter,
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter
		#ifdef OBJ_EDITING_API
		,
		&nSamplesRendered, &parameterAvailableForEditing
		#endif
		) ) != IVAS_ERR_OK )

lib_com/options.h

+1 −1

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

		/* ################## Start DEVELOPMENT switches ######################### */

		#define OBJ_EDITING_INTERFACE /* Interface for object editing */
		//#define OBJ_EDITING_INTERFACE /* Interface for object editing */
		#ifdef OBJ_EDITING_INTERFACE
		#define OBJ_EDITING_API /* object editing changes related to the API */
		#define OBJ_EDITING_DECODER /* object editing changes realted to the decoder functions */

lib_dec/lib_dec.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2100,6 +2100,7 @@ ivas_error IVAS_DEC_GetObjectMetadata(
		metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;
		}
		}
		#ifdef OBJ_EDITING_PARAMISM
		else if ( st_ivas->ism_mode == ISM_MODE_PARAM )
		{
		if ( st_ivas->hParamIsmDec->has_been_edited )
		@@ -2119,6 +2120,7 @@ ivas_error IVAS_DEC_GetObjectMetadata(
		metadata->gainFactor = 1.f;
		metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;
		}
		#endif
		else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )
		{
		if ( st_ivas->hIsmRendererData->has_been_edited )