Added radius and orientation encoding to metadata under define TD5 (315a71fb) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/Workspace_msvc.sln

+0 −10

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
		..\.clang-format = ..\.clang-format
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ivas_crend_unit_test", "..\scripts\ivas_pytests\tests\unit_tests\crend\ivas_crend_unit_test.vcxproj", "{32354377-ACA7-40F9-9A0E-87FC956F0B78}"
		EndProject
		Global
		GlobalSection(SolutionConfigurationPlatforms) = preSolution
		Debug\|Win32 = Debug\|Win32
		@@ -118,14 +116,6 @@ Global
		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests\|Win32.ActiveCfg = Unittests\|Win32
		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests\|Win32.Build.0 = Unittests\|Win32
		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests\|x64.ActiveCfg = Release\|Win32
		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Debug\|x64.ActiveCfg = Debug\|Win32
		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Release\|Win32.ActiveCfg = Release\|Win32
		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Release\|x64.ActiveCfg = Release\|Win32
		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Unittests\|Win32.ActiveCfg = Release\|Win32
		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Unittests\|Win32.Build.0 = Release\|Win32
		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Unittests\|x64.ActiveCfg = Release\|Win32
		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Unittests\|x64.Build.0 = Release\|Win32
		EndGlobalSection
		GlobalSection(SolutionProperties) = preSolution
		HideSolutionNode = FALSE

apps/decoder.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -378,9 +378,17 @@ int main(
		IVAS_RENDER_CONFIG_DATA renderConfig;

		/* sanity check */
		#ifdef TD5
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		#endif
		{
		#ifdef TD5
		fprintf( stderr, "\nExternal Renderer Config is supported only for BINAURAL and BINAURAL_ROOM. Exiting. \n\n" );
		#else
		fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n\n" );
		#endif
		goto cleanup;
		}

		@@ -1262,6 +1270,9 @@ static ivas_error decodeG192(
		ivas_error error = IVAS_ERR_UNKNOWN;
		uint16_t numObj = 0;
		IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;
		#ifdef TD5
		float Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES][3];
		#endif

		IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		@@ -1332,13 +1343,21 @@ static ivas_error decodeG192(
		{
		IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

		#ifdef TD5
		if ( ( error = HeadRotationFileReading( headRotReader, Quaternions, Pos ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = HeadRotationFileReading( headRotReader, Quaternions, frame ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) );
		goto cleanup;
		}

		#ifdef TD5
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions, Pos ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;

apps/renderer.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -892,7 +892,12 @@ int main(
		if ( headRotReader != NULL )
		{
		IVAS_QUATERNION quatBuffer[RENDERER_HEAD_POSITIONS_PER_FRAME];
		#ifdef TD5
		float Pos[RENDERER_HEAD_POSITIONS_PER_FRAME][3];
		HeadRotationFileReading( headRotReader, quatBuffer, Pos );
		#else
		HeadRotationFileReading( headRotReader, quatBuffer, frame );
		#endif
		IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer );
		}
		else

lib_com/common_api_types.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,11 @@ typedef struct _IVAS_ISM_METADATA
		float radius;
		float spread;
		float gainFactor;
		#ifdef TD5
		/* Add azimuth/elevation for orientation here */
		float azimuth_orientation; /* azimuth orientation value */
		float elevation_orientation; /* elevation orientation value */
		#endif
		} IVAS_ISM_METADATA;

		typedef struct
		@@ -116,6 +121,9 @@ typedef struct _IVAS_RENDER_CONFIG
		IVAS_RENDER_TYPE_OVERRIDE renderer_type_override;
		#endif
		IVAS_ROOM_ACOUSTICS_CONFIG_DATA room_acoustics;
		#ifdef TD5
		float directivity[3];
		#endif
		} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;

		typedef struct _IVAS_LS_CUSTOM_LAYOUT

lib_com/ivas_cnst.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,12 @@ typedef enum
		#define ISM_Q_STEP 2.5f
		#define ISM_Q_STEP_BORDER 5.0f

		#ifdef TD5
		#define ISM_RADIUS_NBITS 6
		#define ISM_RADIUS_MIN 0.0f
		#define ISM_RADIUS_DELTA 0.25f /* Max radius = (2^ISM_RADIUS_NBITS-1)0.25 = 15.75 /
		#endif // To do TD5

		/* Parametric ISM */
		#define MAX_PARAM_ISM_NBANDS 11
		#define MAX_PARAM_ISM_NBANDS_WB 9
		@@ -355,7 +361,12 @@ enum
		IND_ISM_AZIMUTH = TAG_ISM_LOOP_START,
		IND_ISM_ELEVATION_DIFF_FLAG = TAG_ISM_LOOP_START,
		IND_ISM_ELEVATION = TAG_ISM_LOOP_START,
		#ifdef TD5
		IND_ISM_RADIUS_DIFF_FLAG = TAG_ISM_LOOP_START,
		IND_ISM_RADIUS = TAG_ISM_LOOP_START,
		#endif // TD5
		TAG_ISM_LOOP_END = TAG_ISM_LOOP_START + 100, /* IVAS_fmToDo: to be reviewed once the final metadata are defined */

		/* --------- end of loop for objects ----------- */

		ISM_MAX_NUM_INDICES