Commit a0678aca authored by Jan Brouwer's avatar Jan Brouwer
Browse files

solved some compiler and clang-format warnings

parent f795b400

lib_util/render_config_reader.c

+16 −13
Original line number Diff line number Diff line
@@ -1255,11 +1255,14 @@ static ivas_error RenderConfigReader_readReverb( 
#endif



ivas_error RenderConfigReader_read(

    RenderConfigReader *pRenderConfigReader, /* i/o : RenderConfigReader handle           */

#ifdef CONTROL_METADATA_REVERB

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

    const char *pRenderConfigPath,           /* i  : Renderer configuration file path       */

#endif

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig  /* o  : Renderer configuration handle          */

#else

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig  /* o  : Renderer configuration handle          */

#endif

)

{

    int32_t file_size;
@@ -1271,12 +1274,12 @@ ivas_error RenderConfigReader_read( 
    char item[MAX_ITEM_LENGTH + 1];

    char chapter[MAX_ITEM_LENGTH + 1];

    char *pValue;

    int16_t nBandsInput;

#ifdef CONTROL_METADATA_REVERB

    ivas_error error;

    int32_t params_length;

    int32_t length;

#else

    int16_t nBandsInput;

    int16_t nVectorsMissing;

#endif
@@ -1286,8 +1289,8 @@ ivas_error RenderConfigReader_read( 
    pConfig_str = (char *) calloc( file_size + 1, sizeof( char ) );

    pParams = (char *) calloc( file_size + 1, sizeof( char ) );

    pTemp = (char *) calloc( file_size + 1, sizeof( char ) );

    nBandsInput = hRenderConfig->room_acoustics.nBands;

#ifndef CONTROL_METADATA_REVERB

    nBandsInput = hRenderConfig->room_acoustics.nBands;

    nVectorsMissing = N_REVERB_VECTORS;

#endif
@@ -1448,7 +1451,7 @@ ivas_error RenderConfigReader_read( 


                        if ( ( error = RenderConfigReader_readReverb( pCombinedName, pRenderConfigReader ) ) != IVAS_ERR_OK )

                        {

                            errorHandler( item, error );

                            errorHandler( item, ERROR_VALUE_INVALID );

                        }

                        free( pCombinedName );

                    }

lib_util/render_config_reader.h

+7 −4
Original line number Diff line number Diff line
@@ -66,11 +66,14 @@ ivas_error RenderConfigReader_checkValues( 


/* Reads a configuration                                                                    */

ivas_error RenderConfigReader_read(

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

#ifdef CONTROL_METADATA_REVERB

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

    const char *pRenderConfigPath,           /* i  : Renderer configuration file path       */

#endif

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig  /* o  : Renderer configuration handle          */

#else

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig  /* o  : Renderer configuration handle          */

#endif

);



/* Closes the renderer configuration reader and deallocates memory                          */