Handling of directivity parameters from binary configuration reader (4a386502) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_util/render_config_reader.c

+10 −7

Original line number	Diff line number	Diff line
		@@ -1357,14 +1357,14 @@ ivas_error RenderConfigReader_open(


		/------------------------------------------------------------------------------------------
		* RenderConfigReader_readBinReverb()
		* RenderConfigReader_readBinary()
		*
		* Reads the binary reverb configuration from a file
		* Reads the binary configuration from a file
		------------------------------------------------------------------------------------------/

		#ifdef CONTROL_METADATA_REVERB
		static ivas_error RenderConfigReader_readBinReverb(
		const char pReverbConfigPath, / i : Reverb configuration file path */
		static ivas_error RenderConfigReader_readBinary(
		const char pReverbConfigPath, / i : Configuration file path */
		RenderConfigReader pRenderConfigReader / i/o : RenderConfigReader handle */
		)
		{
		@@ -2624,11 +2624,14 @@ ivas_error RenderConfigReader_read(
		strncpy( pCombinedName, pRenderConfigPath, length );
		strcpy( pCombinedName + length, pValue );

		if ( ( error = RenderConfigReader_readBinReverb( pCombinedName, pRenderConfigReader ) ) != IVAS_ERR_OK )
		if ( ( error = RenderConfigReader_readBinary( pCombinedName, pRenderConfigReader ) ) != IVAS_ERR_OK )
		{
		errorHandler( item, ERROR_VALUE_INVALID );
		return IVAS_ERR_INVALID_RENDER_CONFIG;
		}
		#ifdef CONTROL_METADATA_DIRECTIVITY
		mvr2r( pRenderConfigReader->directivity, hRenderConfig->directivity, 3 );
		#endif
		free( pCombinedName );
		}
		else
		@@ -2655,7 +2658,7 @@ ivas_error RenderConfigReader_read(
		if ( strcmp( item, "DIRECTIVITY" ) == 0 )
		{
		#ifdef CONTROL_METADATA_REVERB
		if ( read_txt_vector( pValue, 3, pRenderConfigReader->directivity ) )
		if ( read_txt_vector( pValue, 3, hRenderConfig->directivity ) )
		#else
		if ( read_vector( pValue, 3, hRenderConfig->directivity ) )
		#endif