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

RenderConfigReader_checkValues() return value was was erroneously discarded... 

RenderConfigReader_checkValues() return value was  was erroneously discarded in RenderConfigReader_read()
parent 5164c576

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -505,7 +505,11 @@ int main( 
            goto cleanup;

        }



#ifdef CONTROL_METADATA_REVERB

        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )

#else

        if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );

            goto cleanup;

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -731,7 +731,11 @@ int main( 
            exit( -1 );

        }



#ifdef CONTROL_METADATA_REVERB

        if ( RenderConfigReader_read( renderConfigReader, args.renderConfigFilePath, &renderConfig ) != IVAS_ERR_OK )

#else

        if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "Failed to read renderer configuration from file %s\n", args.renderConfigFilePath );

            exit( -1 );

lib_util/render_config_reader.c

+5 −6
Original line number Diff line number Diff line
@@ -928,9 +928,6 @@ ivas_error RenderConfigReader_open( 
{

    RenderConfigReader *pSelf;

    FILE *pConfigFile;

#ifndef CONTROL_METADATA_REVERB

    int length;

#endif



    /* Open the configuration file  */

    if ( strlen( pConfigPath ) < 1 )
@@ -1259,7 +1256,9 @@ static ivas_error RenderConfigReader_readReverb( 


ivas_error RenderConfigReader_read(

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

#ifdef CONTROL_METADATA_REVERB

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

#endif

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* o   : Renderer configuration handle       */

)

{
@@ -1520,7 +1519,7 @@ ivas_error RenderConfigReader_read( 
#ifdef CONTROL_METADATA_REVERB

    return IVAS_ERR_OK;

#else

    RenderConfigReader_checkValues( hRenderConfig );

    return RenderConfigReader_checkValues( hRenderConfig );

#endif

}

lib_util/render_config_reader.h

+4 −2
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ ivas_error RenderConfigReader_checkValues( 
/* Reads a configuration                                                                    */

ivas_error RenderConfigReader_read(

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

#ifdef CONTROL_METADATA_REVERB

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

#endif

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* o  : Renderer configuration handle          */

);