Merge branch '439-orientation-tracking-parameter-aspects' into 'main' (33ba50d9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -226,10 +226,18 @@ int main(
		* Open decoder handle
		------------------------------------------------------------------------------------------/

		#ifdef FIX_439_OTR_PARAMS
		#ifdef NON_DIEGETIC_PAN
		if ( ( error = IVAS_DEC_Open( &hIvasDec, arg.decMode ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_Open( &hIvasDec, arg.decMode, arg.no_diegetic_pan ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef NON_DIEGETIC_PAN
		if ( ( error = IVAS_DEC_Open( &hIvasDec, arg.decMode, arg.orientation_tracking ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_Open( &hIvasDec, arg.decMode, arg.orientation_tracking, arg.no_diegetic_pan ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		fprintf( stderr, "Open failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -395,10 +403,18 @@ int main(
		* Configure the decoder
		------------------------------------------------------------------------------------------/

		#ifdef FIX_439_OTR_PARAMS
		#ifdef NON_DIEGETIC_PAN
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.orientation_tracking, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef NON_DIEGETIC_PAN
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

apps/renderer.c

+42 −2

Original line number	Diff line number	Diff line
		@@ -135,7 +135,11 @@ typedef struct
		char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		#ifdef FIX_439_OTR_PARAMS
		int8_t orientation_tracking;
		#else
		int8_t orientationTracking;
		#endif
		#ifdef NON_DIEGETIC_PAN
		int16_t nonDiegeticPan;
		float nonDiegeticPanGain;
		@@ -732,7 +736,11 @@ int main(
		}
		}

		#ifdef FIX_439_OTR_PARAMS
		if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientation_tracking ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientationTracking ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -1424,30 +1432,54 @@ static bool parseDiegeticPan(

		static bool parseOrientationTracking(
		char *value,
		int8_t *tracking_type )
		#ifdef FIX_439_OTR_PARAMS
		int8_t *orientation_tracking
		#else
		int8_t *tracking_type
		#endif
		)
		{

		to_upper( value );

		if ( strcmp( value, "NONE" ) == 0 )
		{
		#ifdef FIX_439_OTR_PARAMS
		*orientation_tracking = HEAD_ORIENT_TRK_NONE;
		#else
		*tracking_type = IVAS_ORIENT_TRK_NONE;
		#endif
		}
		else if ( strcmp( value, "REF" ) == 0 )
		{
		#ifdef FIX_439_OTR_PARAMS
		*orientation_tracking = HEAD_ORIENT_TRK_REF;
		#else
		*tracking_type = IVAS_ORIENT_TRK_REF;
		#endif
		}
		else if ( strcmp( value, "AVG" ) == 0 )
		{
		#ifdef FIX_439_OTR_PARAMS
		*orientation_tracking = HEAD_ORIENT_TRK_AVG;
		#else
		*tracking_type = IVAS_ORIENT_TRK_AVG;
		#endif
		}
		else if ( strcmp( value, "REF_VEC" ) == 0 )
		{
		#ifdef FIX_439_OTR_PARAMS
		*orientation_tracking = HEAD_ORIENT_TRK_REF_VEC;
		#else
		*tracking_type = IVAS_ORIENT_TRK_REF_VEC;
		#endif
		}
		else if ( strcmp( value, "REF_VEC_LEV" ) == 0 )
		{
		#ifdef FIX_439_OTR_PARAMS
		*orientation_tracking = HEAD_ORIENT_TRK_REF_VEC_LEV;
		#else
		*tracking_type = IVAS_ORIENT_TRK_REF_VEC_LEV;
		#endif
		}
		else
		{
		@@ -1671,7 +1703,11 @@ static CmdlnArgs defaultArgs(
		clearString( args.customHrtfFilePath );
		clearString( args.renderConfigFilePath );

		#ifdef FIX_439_OTR_PARAMS
		args.orientation_tracking = HEAD_ORIENT_TRK_NONE;
		#else
		args.orientationTracking = IVAS_ORIENT_TRK_NONE;
		#endif
		#ifdef NON_DIEGETIC_PAN
		args.nonDiegeticPan = 0;
		args.nonDiegeticPanGain = 0.f;
		@@ -1784,7 +1820,11 @@ static void parseOption(
		break;
		case CmdLnOptionId_orientationTracking:
		assert( numOptionValues == 1 );
		#ifdef FIX_439_OTR_PARAMS
		if ( !parseOrientationTracking( optionValues[0], &args->orientation_tracking ) )
		#else
		if ( !parseOrientationTracking( optionValues[0], &args->orientationTracking ) )
		#endif
		{
		fprintf( stderr, "Unknown option for orientation tracking: %s\n", optionValues[0] );
		exit( -1 );

lib_com/common_api_types.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,16 @@ typedef struct
		float x, y, z;
		} IVAS_VECTOR3;

		#ifdef FIX_439_OTR_PARAMS
		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;
		#endif

		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_com/ivas_cnst.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -1642,6 +1642,7 @@ typedef enum
		} SFX_OpMode_t;


		#ifndef FIX_439_OTR_PARAMS
		/----------------------------------------------------------------------------------
		* Orientation tracking constants
		----------------------------------------------------------------------------------/
		@@ -1662,7 +1663,7 @@ typedef enum
		OTR_TRACKING_REF_VEC = IVAS_ORIENT_TRK_REF_VEC, /* track orientation relative to external reference vector */
		OTR_TRACKING_REF_VEC_LEV = IVAS_ORIENT_TRK_REF_VEC_LEV /* track orientation relative to level component of external reference vector */
		} OTR_TRACKING_T;

		#endif

		/----------------------------------------------------------------------------------
		* Reverberator constants

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,7 @@
		#define FIX_446_STEREO_DMX_CRASH /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */

		#define FIX_386_CORECODER_RECONFIG_2 /* VA: Issue 386: Resolve remaining ToDo comments in CoreCoder reconfig. */
		#define FIX_439_OTR_PARAMS /* Philips: Issue 439: orientation tracking parameter aspects. */
		#define FIX_440_PARAM_ISM_DIR_NOISE /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */

		#define LBR_SBA_DIRAC_FIX /* DLB: Bug fix for DirAC at low bitrates */

Admin message