[cleanup] accept OBJ_EDITING_API (909f5c33) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -2266,7 +2266,6 @@ static ivas_error decodeG192(
		return error;
		}

		#ifdef OBJ_EDITING_API
		/* Object metadata editing */
		if ( arg.objEditEnabled )
		{
		@@ -2351,7 +2350,6 @@ static ivas_error decodeG192(
		fprintf( stderr, "\nError: could not prepare the renderer: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#endif
		}

		if ( isSplitRend )
		@@ -2806,9 +2804,7 @@ static ivas_error decodeVoIP(
		int16_t vec_pos_update, vec_pos_len;
		int16_t nOutSamples = 0;
		bool bitstreamReadDone = false;
		#ifdef OBJ_EDITING_API
		bool parametersAvailableForEditing = false;
		#endif
		uint16_t nSamplesRendered;

		vec_pos_update = 0;
		@@ -3109,17 +3105,9 @@ static ivas_error decodeVoIP(
		while ( nSamplesRendered < nOutSamples )
		{
		#ifdef SUPPORT_JBM_TRACEFILE
		#ifdef OBJ_EDITING_API
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, systemTime_ms ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef OBJ_EDITING_API
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, systemTime_ms ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -3150,7 +3138,6 @@ static ivas_error decodeVoIP(
		}
		}

		#ifdef OBJ_EDITING_API
		/* Object metadata editing */
		if ( arg.objEditEnabled && parametersAvailableForEditing == true )
		{
		@@ -3179,7 +3166,6 @@ static ivas_error decodeVoIP(
		return error;
		}
		}
		#endif
		} /* while ( nSamplesRendered < nOutSamples ) */

		/* write JBM Offset file entry */

lib_com/common_api_types.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -141,13 +141,10 @@ typedef struct _IVAS_ISM_METADATA
		float yaw;
		float pitch;
		Word16 non_diegetic_flag;
		#ifdef OBJ_EDITING_API
		Word32 gain_fx; /* Q29 */
		#endif

		} IVAS_ISM_METADATA;

		#ifdef OBJ_EDITING_API
		typedef struct _IVAS_EDITABLE_PARAMETERS
		{
		Word16 num_obj;
		@@ -155,7 +152,6 @@ typedef struct _IVAS_EDITABLE_PARAMETERS
		Word32 gain_bed_fx; /* Q29 */

		} IVAS_EDITABLE_PARAMETERS;
		#endif

		typedef struct
		{

lib_com/ivas_error.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -77,9 +77,7 @@ typedef enum
		IVAS_ERR_EXT_ORIENTATION_NOT_SUPPORTED,
		IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,
		IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,
		#ifdef OBJ_EDITING_API
		IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,
		#endif
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,
		#endif
		@@ -255,10 +253,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
		return "Directivity not supported";
		case IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED:
		return "Acoustic environment not supported";
		#ifdef OBJ_EDITING_API
		case IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED:
		return "Objects editing not supported";
		#endif
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		case IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED:
		return "Wrong use of both Object editing and Non-diegetic panning";

lib_com/ivas_ism_com_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -470,7 +470,6 @@ void ivas_ism_reset_metadata(
		hIsmMeta->non_diegetic_flag = 0;
		move16();

		#ifdef OBJ_EDITING_API
		hIsmMeta->edited_gain_fx = ONE_IN_Q29;
		move32();
		hIsmMeta->edited_azimuth_fx = 0;
		@@ -487,7 +486,6 @@ void ivas_ism_reset_metadata(
		move32();
		hIsmMeta->non_diegetic_flag = 0;
		move16();
		#endif

		return;
		}

lib_com/ivas_prot_fx.h

+0 −17

Original line number	Diff line number	Diff line
		@@ -3924,7 +3924,6 @@ ivas_error ivas_osba_render_sf_fx(
		Word32 p_output[] / o : rendered time signal */
		);

		#ifdef OBJ_EDITING_API
		void ivas_osba_stereo_add_channels_fx(
		Word32 tc_fx[], / i : transport channels */
		Word32 output_fx[], / i/o: output channels */
		@@ -3934,16 +3933,6 @@ void ivas_osba_stereo_add_channels_fx(
		const Word16 ism_mode, /* i : ISM mode */
		const UWord16 n_samples_to_render /* i : output frame length per channel */
		);
		#else
		void ivas_osba_stereo_add_channels_fx(
		Word32 tc_fx[], / i : transport channels */
		Word32 output_fx[], / i/o: output channels */
		const Word16 gain, /* i : gain bed value Q11 */
		const Word16 nchan_out, /* i : number of output channels */
		const Word16 nchan_ism, /* i : number of ISM channels */
		const UWord16 n_samples_to_render /* i : output frame length per channel */
		);
		#endif

		void ivas_osba_data_close_fx(
		SBA_ISM_DATA_HANDLE hSbaIsmData / i/o: OSBA rendering handle */
		@@ -4259,11 +4248,9 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
		Word32 data / i/o: transport channels/output synthesis signal */
		);

		#ifdef OBJ_EDITING_API
		void ivas_dec_prepare_renderer_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);
		#endif

		void ivas_jbm_dec_get_adapted_subframes(
		const Word16 nCldfbTs, /* i : number of time slots in the current frame */
		@@ -4358,7 +4345,6 @@ void ivas_param_ism_dec_digest_tc_fx(
		);


		#ifdef OBJ_EDITING_API
		void ivas_param_ism_dec_dequant_md_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		);
		@@ -4367,7 +4353,6 @@ void ivas_param_ism_dec_prepare_renderer_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const Word16 nCldfbSlots /* i : number of CLDFB slots in transport channels */
		);
		#endif

		void ivas_param_ism_dec_render_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		@@ -5167,12 +5152,10 @@ void ivas_param_mc_dec_digest_tc_fx(
		const Word16 transport_f_e
		);

		#ifdef OBJ_EDITING_API
		void ivas_param_mc_dec_prepare_renderer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const UWord8 nCldfbSlots /* i : number of CLFBS slots in the transport channels */
		);
		#endif

		void ivas_param_mc_dec_render_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */