[cleanup] accept OBJ_EDITING_EXAMPLE (d9d2d0eb) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −47

Original line number	Diff line number	Diff line
		@@ -171,13 +171,11 @@ static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t pcmBuf );
		#endif
		static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );
		#ifdef OBJ_EDITING_EXAMPLE
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS editableParameters, ObjectEditFileReader objectEditFileReader );
		#else
		static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS *editableParameters );
		#endif
		#endif


		/------------------------------------------------------------------------------------------
		@@ -2288,53 +2286,12 @@ static ivas_error decodeG192(
		}
		#endif

		#ifdef OBJ_EDITING_EXAMPLE
		/* Do object metadata editing here ... */
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		do_object_editing_fx( &editableParameters, objectEditFileReader );
		#else
		do_object_editing_fx( &editableParameters );
		#endif
		#else
		/* edit object parameters...*/

		/* put the objects equally spaced at the horizontal plane */
		/* and play a little bit with the gains... */
		Word16 obj_idx, non_diegetic_obj_idx;
		Word16 num_nondiegetic_objects;

		num_nondiegetic_objects = 0;
		for ( obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )
		{
		if ( !editableParameters.ism_metadata[obj_idx].non_diegetic_flag )
		{
		num_nondiegetic_objects++;
		}
		}
		if ( num_nondiegetic_objects )
		{
		float start_angle, angle_inc;
		angle_inc = 360.0f / (float) num_nondiegetic_objects;
		start_angle = angle_inc / 2.0f;
		for ( obj_idx = 0, non_diegetic_obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )
		{
		if ( !editableParameters.ism_metadata[obj_idx].non_diegetic_flag )
		{
		editableParameters.ism_metadata[obj_idx].elevation_fx = 0;
		editableParameters.ism_metadata[obj_idx].azimuth_fx = (Word32) ( ( start_angle + (float) non_diegetic_obj_idx * angle_inc ) * powf( 2.0f, 22.0f ) );
		non_diegetic_obj_idx++;
		}
		}
		}

		/* breakover object gains */
		for ( obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )
		{
		editableParameters.ism_metadata[obj_idx].gain_fx = (Word32) ( ( 0.5f + (float) ( ( frame + obj_idx * 50 ) % 250 ) / 250.0f ) * powf( 2.0f, 29.0f ) );
		}

		editableParameters.gain_bed_fx = ( 1 << 28 ); // 0.5 in Q29
		#endif

		/* set new object parameters*/
		if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
		@@ -3151,14 +3108,12 @@ static ivas_error decodeVoIP(
		}

		/* Do object metadata editing here ... */
		#ifdef OBJ_EDITING_EXAMPLE
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		do_object_editing_fx( &editableParameters, objectEditFileReader );
		#else
		do_object_editing_fx( &editableParameters );
		#endif

		#endif
		/* set new object parameters */
		if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
		{
		@@ -3469,7 +3424,6 @@ cleanup:
		return error;
		}

		#ifdef OBJ_EDITING_EXAMPLE

		/---------------------------------------------------------------------
		* do_object_editing_fx()
		@@ -3589,7 +3543,6 @@ static void do_object_editing_fx(
		return;
		}

		#endif

		/---------------------------------------------------------------------
		* load_hrtf_from_file()

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,6 @@
		#define TMP_FIX_SPLIT_REND // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)
		#define TMP_FIX_OMASA_SR_BE // temporary fix to keep OMASA split-rendering BE
		#define OBJ_EDITING_COMMANDLINE /* obj editing command-line option */
		#define OBJ_EDITING_EXAMPLE /* obj editing example code in decoder.c */
		#define OMASA_OBJECT_EDITING /* Nokia: object editing interface for OMASA */
		#ifdef OMASA_OBJECT_EDITING
		#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES // Nokia: Fix 1399_1400 issue in float, this is essential for the BASOP porting