Merge branch '20230320_maintenance' into 'main' (425ab4c9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_com.vcxproj

+1 −1

Original line number	Diff line number	Diff line
		@@ -244,9 +244,9 @@
		<ClCompile Include="..\lib_com\ivas_entropy_coder_common.c" />
		<ClCompile Include="..\lib_com\ivas_fb_mixer.c" />
		<ClCompile Include="..\lib_com\ivas_filters.c" />
		<ClCompile Include="..\lib_com\ivas_ism_com.c" />
		<ClCompile Include="..\lib_com\ivas_mcmasa_com.c" />
		<ClCompile Include="..\lib_com\ivas_dirac_com.c" />
		<ClCompile Include="..\lib_com\ivas_ism_config.c" />
		<ClCompile Include="..\lib_com\ivas_masa_com.c" />
		<ClCompile Include="..\lib_com\ivas_mct_com.c" />
		<ClCompile Include="..\lib_com\ivas_mc_com.c" />

Workspace_msvc/lib_com.vcxproj.filters

+3 −3

Original line number	Diff line number	Diff line
		@@ -379,9 +379,6 @@
		<ClCompile Include="..\lib_com\swb_bwe_com_lr.c">
		<Filter>common_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_ism_config.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_qmetadata_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		@@ -466,6 +463,9 @@
		<ClCompile Include="..\lib_com\ivas_td_decorr.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_ism_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_com\basop_proto_func.h">

apps/decoder.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1731,7 +1731,7 @@ static ivas_error decodeG192(
		}
		}

		/* Write ISm metadata to external file(s) */
		/* Write ISM metadata to external file(s) */
		if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT )
		{
		if ( bsFormat == IVAS_DEC_BS_OBJ )

apps/encoder.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -706,7 +706,7 @@ int main(
		}
		#endif

		/* Read ISm input metadata */
		/* Read ISM input metadata */
		for ( i = 0; i < numIsmInputs; ++i )
		{
		if ( ismReaders[i] == NULL )

apps/renderer.c

+14 −12

Original line number	Diff line number	Diff line
		@@ -761,7 +761,7 @@ int main(
		}

		#ifdef FIX_I109_ORIENTATION_TRACKING
		if ( IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientationTracking ) )
		if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientationTracking ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -988,17 +988,18 @@ int main(
		{
		IVAS_QUATERNION quaternion;
		#ifdef TD5
		if ( HeadRotationFileReading( referenceRotReader, &quaternion, NULL ) != IVAS_ERR_OK )
		if ( ( error = HeadRotationFileReading( referenceRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK )
		#else
		if ( HeadRotationFileReading( referenceRotReader, &quaternion ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error in Head Rotation File Reading.\r\n" );
		fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		if ( IVAS_REND_SetReferenceRotation( hIvasRend, quaternion ) != IVAS_ERR_OK )

		if ( ( error = IVAS_REND_SetReferenceRotation( hIvasRend, quaternion ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error setting Reference Rotation.\r\n" );
		fprintf( stderr, "Error setting Reference Rotation: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		@@ -1008,16 +1009,17 @@ int main(
		if ( headRotReader != NULL )
		{
		IVAS_QUATERNION quatBuffer[RENDERER_HEAD_POSITIONS_PER_FRAME];

		#ifdef FIX_I109_ORIENTATION_TRACKING
		for ( i = 0; i < RENDERER_HEAD_POSITIONS_PER_FRAME; i++ )
		{
		#ifdef TD5
		if ( HeadRotationFileReading( headRotReader, &quatBuffer[i], &Pos[i] ) != IVAS_ERR_OK )
		if ( ( error = HeadRotationFileReading( headRotReader, &quatBuffer[i], &Pos[i] ) ) != IVAS_ERR_OK )
		#else
		if ( HeadRotationFileReading( headRotReader, &quatBuffer[i] ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error in Head Rotation File Reading.\r\n" );
		fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		@@ -1029,24 +1031,24 @@ int main(
		#endif
		#endif
		#ifdef TD5
		if ( IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer, Pos ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer, Pos ) ) != IVAS_ERR_OK )
		#else
		if ( IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error setting Head Rotation\n" );
		fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		else
		{
		#ifdef TD5
		if ( ( IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) != IVAS_ERR_OK ) && ( IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) != IVAS_ERR_INVALID_OUTPUT_FORMAT ) )
		if ( ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) ) != IVAS_ERR_OK ) && ( IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC
		#else
		if ( ( IVAS_REND_SetHeadRotation( hIvasRend, NULL ) != IVAS_ERR_OK ) && ( IVAS_REND_SetHeadRotation( hIvasRend, NULL ) != IVAS_ERR_INVALID_OUTPUT_FORMAT ) )
		#endif
		{
		fprintf( stderr, "Error setting Head Rotation\n" );
		fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		@@ -1916,7 +1918,7 @@ void getMetadataFromFileReader(

		if ( ( error = IsmFileReader_readNextFrame( ismReader, &ismMetadata ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError (%s) while reading ism metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );
		fprintf( stderr, "\nError (%s) while reading ISM metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );
		exit( -1 );
		}