Fixed automatic merge issues (0d8f5fac) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_util/render_config_reader.c

+26 −6

Original line number	Diff line number	Diff line
		@@ -1111,7 +1111,7 @@ static int16_t read_txt_vector(

		static int16_t read_vector(
		char pLine, / i : String to read from */
		const int32_t length, /* i : Number of expected vector elements */
		const int16_t length, /* i : Number of expected vector elements */
		float pTarget / o : Output vector pointer */
		)
		{
		@@ -1219,11 +1219,11 @@ static int32_t errorHandler(
		break;
		case ERROR_ITEM_UNKNOWN:
		numErrors++;
		fprintf( stderr, "Unexpected variable %s in renderer configuration file.\n\n", badStr );
		fprintf( stderr, "Unknown variable %s in renderer configuration file.\n\n", badStr );
		break;
		case ERROR_VALUE_INVALID:
		numErrors++;
		fprintf( stderr, "Unexpected value %s in renderer configuration file.\n\n", badStr );
		fprintf( stderr, "Invalid value %s in renderer configuration file.\n\n", badStr );
		break;
		default:
		numErrors++;
		@@ -2669,7 +2669,6 @@ ivas_error RenderConfigReader_read(
		}
		else if ( strcmp( item, "DOF" ) == 0 )
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		dofProvided = true;
		if ( !sscanf( pValue, "%hd", &hRenderConfig->split_rend_config.dof ) )
		{
		@@ -2717,8 +2716,29 @@ ivas_error RenderConfigReader_read(
		errorHandler( pValue, ERROR_VALUE_INVALID );
		}
		}
		#endif

		else if ( strcmp( item, "RENDERER" ) == 0 )
		{
		if ( strcmp( pValue, "CREND" ) == 0 )
		{
		hRenderConfig->split_rend_config.rendererSelection = IVAS_SPLIT_REND_RENDERER_SELECTION_CREND;
		}
		else if ( strcmp( pValue, "FASTCONV" ) == 0 )
		{
		hRenderConfig->split_rend_config.rendererSelection = IVAS_SPLIT_REND_RENDERER_SELECTION_FASTCONV;
		}
		else if ( strcmp( pValue, "PARAMBIN" ) == 0 )
		{
		hRenderConfig->split_rend_config.rendererSelection = IVAS_SPLIT_REND_RENDERER_SELECTION_PARAMBIN;
		}
		else if ( strcmp( pValue, "TDREND" ) == 0 )
		{
		hRenderConfig->split_rend_config.rendererSelection = IVAS_SPLIT_REND_RENDERER_SELECTION_TDREND;
		}
		else
		{
		errorHandler( pValue, ERROR_VALUE_INVALID );
		}
		}
		#ifdef DEBUGGING
		else
		{