[cleanup] accept FIX_657_REMOVE_EDITING (d5a53e84) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,6 @@



		#define FIX_657_REMOVE_EDITING /* Nokia: Remove remaining unused coded related to object editing */
		#define FIX_634_MASA_JBM_UNUSED_PARAMETER /* Nokia: Fix issue 634 by removing the unnecessary argument. */
		#define FIX_675_WB_OMASA /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */
		#define FIX_683_JBM_CLEANUP /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

lib_dec/ivas_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -611,10 +611,6 @@ ivas_error ivas_dec(
		hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );
		}

		#ifndef FIX_657_REMOVE_EDITING
		/* Set edited object positions, if editing enabled */
		ivas_omasa_set_edited_objects( st_ivas );
		#endif
		/* 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_jbm_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -426,10 +426,6 @@ ivas_error ivas_jbm_dec_tc(
		ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );
		}

		#ifndef FIX_657_REMOVE_EDITING
		/* Set edited object positions, if editing enabled */
		ivas_omasa_set_edited_objects( st_ivas );
		#endif
		}
		#endif
		else if ( st_ivas->ivas_format == MC_FORMAT )

lib_dec/ivas_masa_dec.c

+0 −67

Original line number	Diff line number	Diff line
		@@ -2584,71 +2584,4 @@ static int16_t ivas_decode_masaism_metadata(
		return ( nb_bits_read - *next_bit_pos );
		}

		#ifndef FIX_657_REMOVE_EDITING
		/-------------------------------------------------------------------
		* ivas_omasa_set_edited_objects()
		*
		*
		-------------------------------------------------------------------/

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

		int16_t dir, sf;
		MASA_ISM_DATA_HANDLE hMasaIsmData;

		hMasaIsmData = st_ivas->hMasaIsmData;
		/* Set positions of the edited objects */
		if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
		{
		if ( st_ivas->editing_ism_enabled )
		{
		for ( sf = 0; sf < ( MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR ); sf++ )
		{
		hMasaIsmData->azimuth_ism[st_ivas->index_of_edited_ism][sf] = st_ivas->azimuth_edited;
		hMasaIsmData->elevation_ism[st_ivas->index_of_edited_ism][sf] = st_ivas->elevation_edited;
		}

		st_ivas->hIsmMetaData[st_ivas->index_of_edited_ism]->azimuth = st_ivas->azimuth_edited;
		st_ivas->hIsmMetaData[st_ivas->index_of_edited_ism]->elevation = st_ivas->elevation_edited;
		}
		}
		else if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
		{
		/* Directions cannot be edited in this mode */
		}
		else
		{
		for ( dir = 0; dir < MAX_NUM_OBJECTS; dir++ )
		{
		if ( dir == st_ivas->index_of_edited_ism && st_ivas->editing_ism_enabled )
		{
		hMasaIsmData->ism_is_edited[dir] = 1;
		hMasaIsmData->azimuth_ism_edited[dir] = st_ivas->azimuth_edited;
		hMasaIsmData->elevation_ism_edited[dir] = st_ivas->elevation_edited;
		}
		else
		{
		hMasaIsmData->ism_is_edited[dir] = 0;
		}
		}

		if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->editing_ism_enabled )
		{
		if ( st_ivas->hMasaIsmData->idx_separated_ism == st_ivas->index_of_edited_ism )
		{
		for ( sf = 0; sf < ( MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR ); sf++ )
		{
		st_ivas->hMasaIsmData->azimuth_separated_ism[sf] = st_ivas->azimuth_edited;
		st_ivas->hMasaIsmData->elevation_separated_ism[sf] = st_ivas->elevation_edited;
		}
		}
		}
		}

		return;
		}
		#endif
		#endif

lib_dec/ivas_omasa_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -86,20 +86,12 @@ ivas_error ivas_omasa_data_open(
		hMasaIsmData->objectsMoved = 0;
		hMasaIsmData->delayBuffer = NULL;

		#ifdef FIX_657_REMOVE_EDITING
		for ( ch = 0; ch < MAX_NUM_OBJECTS; ch++ )
		{
		hMasaIsmData->ism_is_edited[ch] = 0;
		hMasaIsmData->q_elevation_old[ch] = 0.0f;
		hMasaIsmData->q_azimuth_old[ch] = 0.0f;
		}
		#else
		for ( ch = 0; ch < st_ivas->nchan_ism; ch++ )
		{
		hMasaIsmData->q_elevation_old[ch] = 0.0f;
		hMasaIsmData->q_azimuth_old[ch] = 0.0f;
		}
		#endif


		for ( obj_idx = 0; obj_idx < MAX_NUM_OBJECTS; obj_idx++ )