rename enum HEAD_ORIENT_TRK_T and its members to IVAS_* (91c9afa1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2396,23 +2396,23 @@ static bool parseOrientationTracking(

		if ( strcmp( value, "NONE" ) == 0 )
		{
		*orientation_tracking = HEAD_ORIENT_TRK_NONE;
		*orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;
		}
		else if ( strcmp( value, "REF" ) == 0 )
		{
		*orientation_tracking = HEAD_ORIENT_TRK_REF;
		*orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF;
		}
		else if ( strcmp( value, "AVG" ) == 0 )
		{
		*orientation_tracking = HEAD_ORIENT_TRK_AVG;
		*orientation_tracking = IVAS_HEAD_ORIENT_TRK_AVG;
		}
		else if ( strcmp( value, "REF_VEC" ) == 0 )
		{
		*orientation_tracking = HEAD_ORIENT_TRK_REF_VEC;
		*orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC;
		}
		else if ( strcmp( value, "REF_VEC_LEV" ) == 0 )
		{
		*orientation_tracking = HEAD_ORIENT_TRK_REF_VEC_LEV;
		*orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV;
		}
		else
		{
		@@ -2669,7 +2669,7 @@ static CmdlnArgs defaultArgs(
		clearString( args.renderConfigFilePath );
		clearString( args.externalOrientationFilePath );

		args.orientation_tracking = HEAD_ORIENT_TRK_NONE;
		args.orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;
		args.nonDiegeticPan = 0;
		args.nonDiegeticPanGain = 0.f;

lib_com/common_api_types.h

+7 −6

Original line number	Diff line number	Diff line
		@@ -196,12 +196,13 @@ typedef struct

		typedef enum
		{
		HEAD_ORIENT_TRK_NONE,
		HEAD_ORIENT_TRK_REF,
		HEAD_ORIENT_TRK_AVG,
		HEAD_ORIENT_TRK_REF_VEC,
		HEAD_ORIENT_TRK_REF_VEC_LEV
		} HEAD_ORIENT_TRK_T;
		IVAS_HEAD_ORIENT_TRK_NONE,
		IVAS_HEAD_ORIENT_TRK_REF,
		IVAS_HEAD_ORIENT_TRK_AVG,
		IVAS_HEAD_ORIENT_TRK_REF_VEC,
		IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV

		} IVAS_HEAD_ORIENT_TRK_T;

		typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;
		typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE;

lib_dec/ivas_stat_dec.h

+14 −14

Original line number	Diff line number	Diff line
		@@ -898,7 +898,7 @@ typedef struct decoder_config_structure
		int16_t Opt_HRTF_binary; /* indicates whether HRTF binary file is used */
		int16_t Opt_Headrotation; /* indicates whether head-rotation is used */
		int16_t Opt_RendConfigCustom; /* indicates whether Renderer configuration custom setup is used */
		HEAD_ORIENT_TRK_T orientation_tracking; /* indicates orientation tracking type */
		IVAS_HEAD_ORIENT_TRK_T orientation_tracking; /* indicates orientation tracking type */
		int16_t Opt_non_diegetic_pan; /* indicates diegetic or not */
		float non_diegetic_pan_gain; /* non diegetic panning gain*/
		int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */

lib_dec/lib_dec.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -287,7 +287,7 @@ static void init_decoder_config(
		hDecoderConfig->Opt_HRTF_binary = 0;
		hDecoderConfig->Opt_Headrotation = 0;
		hDecoderConfig->Opt_RendConfigCustom = 0;
		hDecoderConfig->orientation_tracking = HEAD_ORIENT_TRK_NONE;
		hDecoderConfig->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;
		hDecoderConfig->Opt_non_diegetic_pan = 0;
		hDecoderConfig->non_diegetic_pan_gain = 0;
		#ifdef API_5MS
		@@ -408,7 +408,7 @@ ivas_error IVAS_DEC_Configure(
		const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */
		const int16_t enableHeadRotation, /* i : enable head rotation for binaural output */
		const int16_t enableExternalOrientation, /* i : enable external orientations */
		const HEAD_ORIENT_TRK_T orientation_tracking, /* i : head orientation tracking type */
		const IVAS_HEAD_ORIENT_TRK_T orientation_tracking, /* i : head orientation tracking type */
		const int16_t renderConfigEnabled, /* i : enable Renderer config. file for binaural output */
		const int16_t Opt_non_diegetic_pan, /* i : diegetic or not */
		const float non_diegetic_pan_gain, /* i : non diegetic panning gain */
		@@ -3561,20 +3561,20 @@ static ivas_error printConfigInfo_dec(
		fprintf( stdout, "External orientation: ON\n" );
		}

		if ( st_ivas->hDecoderConfig->orientation_tracking != HEAD_ORIENT_TRK_NONE )
		if ( st_ivas->hDecoderConfig->orientation_tracking != IVAS_HEAD_ORIENT_TRK_NONE )
		{
		switch ( st_ivas->hDecoderConfig->orientation_tracking )
		{
		case HEAD_ORIENT_TRK_AVG:
		case IVAS_HEAD_ORIENT_TRK_AVG:
		fprintf( stdout, "Orientation tracking: AVG\n" );
		break;
		case HEAD_ORIENT_TRK_REF:
		case IVAS_HEAD_ORIENT_TRK_REF:
		fprintf( stdout, "Orientation tracking: REF\n" );
		break;
		case HEAD_ORIENT_TRK_REF_VEC:
		case IVAS_HEAD_ORIENT_TRK_REF_VEC:
		fprintf( stdout, "Orientation tracking: REF_VEC\n" );
		break;
		case HEAD_ORIENT_TRK_REF_VEC_LEV:
		case IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV:
		fprintf( stdout, "Orientation tracking: REF_VEC_LEV\n" );
		break;
		default:

lib_dec/lib_dec.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ ivas_error IVAS_DEC_Configure(
		const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */
		const int16_t enableHeadRotation, /* i : enable head rotation for binaural output */
		const int16_t enableExternalOrientation, /* i : enable external orientations */
		const HEAD_ORIENT_TRK_T orientation_tracking, /* i : head orientation tracking type */
		const IVAS_HEAD_ORIENT_TRK_T orientation_tracking, /* i : head orientation tracking type */
		const int16_t renderConfigEnabled, /* i : enable Renderer config. file for binaural output */
		const int16_t Opt_non_diegetic_pan, /* i : diegetic or not */
		const float non_diegetic_pan_gain, /* i : non diegetic panning gain */