harmonize OMASA function names (4588f712) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_masa_com.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -883,14 +883,14 @@ void reconstruct_ism_ratios(


		/*---------------------------------------------------------------
		* modify_masa_energy_ratios()
		* ivas_omasa_modify_masa_energy_ratios()
		*
		* Updates energy ratios by taking into account the MASA content contribution
		* to the total audio scene
		---------------------------------------------------------------/

		void modify_masa_energy_ratios(
		IVAS_QMETADATA_HANDLE hQMetaData /* i/o: Metadata handle */
		void ivas_omasa_modify_masa_energy_ratios(
		IVAS_QMETADATA_HANDLE hQMetaData /* i/o: q_metadata handle */
		)
		{
		int16_t i, m, d, b;

lib_com/ivas_prot.h

+13 −15

Original line number	Diff line number	Diff line
		@@ -5685,7 +5685,7 @@ void ivas_set_surplus_brate_dec(
		int32_t ism_total_brate / i : ISM total bitrate */
		);

		void set_ism_importance_interformat(
		void ivas_set_ism_importance_interformat(
		const int32_t ism_total_brate, /* i/o: ISms total bitrate */
		const int16_t nchan_transport, /* i : number of transported channels */
		ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
		@@ -5694,7 +5694,6 @@ void set_ism_importance_interformat(
		int16_t ism_imp[] /* o : ISM importance flags */
		);

		#ifdef MASA_AND_OBJECTS
		/! r: flag for using less bitrate for objects in OMASA /
		int16_t ivas_omasa_ener_brate(
		const int16_t nchan_ism, /* i : number of ISMs */
		@@ -5702,7 +5701,6 @@ int16_t ivas_omasa_ener_brate(
		float data_f[][L_FRAME48k], /* i : Input / transport audio signals */
		const int16_t input_frame /* i : Input frame size */
		);
		#endif

		/! r: adjusted bitrate /
		int32_t ivas_interformat_brate(
		@@ -5740,11 +5738,11 @@ void ivas_merge_masa_transports(
		const int16_t num_transport_channels /* i : Number of transport audio signals */
		);

		ivas_error ivas_masa_ism_data_open(
		ivas_error ivas_omasa_data_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		);

		void ivas_masa_ism_data_close(
		void ivas_omasa_data_close(
		MASA_ISM_DATA_HANDLE hMasaIsmData / i/o: MASA_ISM rendering handle */
		);

		@@ -5769,7 +5767,7 @@ void ivas_omasa_dirac_rend(
		const int16_t output_frame /* i : output frame length per channel */
		);

		void preProcessStereoTransportsForMovedObjects(
		void ivas_omasa_preProcessStereoTransportsForMovedObjects(
		Decoder_Struct *st_ivas,
		float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],
		float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],
		@@ -5777,26 +5775,26 @@ void preProcessStereoTransportsForMovedObjects(
		const int16_t subframe
		);

		ivas_error ivas_masa_ism_separate_object_renderer_open(
		ivas_error ivas_omasa_separate_object_renderer_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		void ivas_masa_ism_separate_object_renderer_close(
		void ivas_omasa_separate_object_renderer_close(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		void ivas_masa_ism_separate_object_render(
		void ivas_omasa_separate_object_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float input_f[][L_FRAME48k], /* i : separated object signal */
		float output_f[][L_FRAME48k], /* i/o: output signals */
		const int16_t output_frame /* i : output frame length per channel */
		);

		void ivas_masa_ism_set_edited_objects(
		void ivas_omasa_set_edited_objects(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		void encode_masa_to_total(
		void ivas_omasa_encode_masa_to_total(
		IVAS_QMETADATA_HANDLE hQMetaData,
		BSTR_ENC_HANDLE hMetaData,
		const int16_t low_bitrate_mode,
		@@ -5804,7 +5802,7 @@ void encode_masa_to_total(
		const int16_t nblocks
		);

		void decode_masa_to_total(
		void ivas_omasa_decode_masa_to_total(
		uint16_t *bit_stream,
		int16_t *index,
		float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],
		@@ -5812,8 +5810,8 @@ void decode_masa_to_total(
		const int16_t nblocks
		);

		void modify_masa_energy_ratios(
		IVAS_QMETADATA_HANDLE hQMetaData
		void ivas_omasa_modify_masa_energy_ratios(
		IVAS_QMETADATA_HANDLE hQMetaData /* i/o: q_metadata handle */
		);

		#endif

lib_dec/ivas_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -568,7 +568,7 @@ ivas_error ivas_dec(
		}

		/* Set edited object positions, if editing enabled */
		ivas_masa_ism_set_edited_objects( st_ivas );
		ivas_omasa_set_edited_objects( st_ivas );

		/* Rendering */
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM \|\| st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

lib_dec/ivas_dirac_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1975,7 +1975,7 @@ void ivas_dirac_dec_render_sf(

		if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )
		{
		preProcessStereoTransportsForMovedObjects( st_ivas, Cldfb_RealBuffer_Temp, Cldfb_ImagBuffer_Temp, hSpatParamRendCom->num_freq_bands, subframe_idx );
		ivas_omasa_preProcessStereoTransportsForMovedObjects( st_ivas, Cldfb_RealBuffer_Temp, Cldfb_ImagBuffer_Temp, hSpatParamRendCom->num_freq_bands, subframe_idx );
		}
		}
		#endif

lib_dec/ivas_init_dec.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1173,7 +1173,7 @@ ivas_error ivas_init_decoder(
		return error;
		}

		if ( ( error = ivas_masa_ism_data_open( st_ivas ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_omasa_data_open( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -1662,7 +1662,7 @@ ivas_error ivas_init_decoder(
		}

		/* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
		if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -1671,7 +1671,7 @@ ivas_error ivas_init_decoder(
		if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ \|\| st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ \|\| st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )
		{
		/* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
		if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2214,8 +2214,8 @@ void ivas_destroy_dec(
		}

		#ifdef MASA_AND_OBJECTS
		/* MASA ISM structure */
		ivas_masa_ism_data_close( &st_ivas->hMasaIsmData );
		/* OMASA structure */
		ivas_omasa_data_close( &st_ivas->hMasaIsmData );
		#endif

		/* Head track data handle */