Commit 68d5f571 authored by bayers's avatar bayers
Browse files

fix render config reading in the decoder (was involuntarily broken in the previous commit)

parent d950deaf

apps/decoder.c

+4 −6
Original line number Diff line number Diff line
@@ -440,8 +440,8 @@ int main( 
     * Load renderer configuration from file

     *--------------------------------------------------------------------*/



    IVAS_RENDER_CONFIG_DATA renderConfig;

    if ( ( error = IVAS_DEC_GetDefaultRenderConfig( &renderConfig ) ) != IVAS_ERR_OK )

    IVAS_RENDER_CONFIG_DATA renderConfigSplit;

    if ( ( error = IVAS_DEC_GetDefaultRenderConfig( &renderConfigSplit ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_GetDefaultRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;
@@ -464,7 +464,7 @@ int main( 
            goto cleanup;

        }

#endif

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

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

        {

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

            goto cleanup;
@@ -516,7 +516,7 @@ int main( 
        if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec

#ifdef API_5MS_BASELINE

                                                      ,

                                                      renderConfig

                                                      renderConfigSplit

#endif

                                                      ) ) != IVAS_ERR_OK )

        {
@@ -675,9 +675,7 @@ int main( 


    if ( arg.renderConfigEnabled )

    {

#ifndef API_5MS

        IVAS_RENDER_CONFIG_DATA renderConfig;

#endif



        /* sanity check */

#ifdef SPLIT_REND_WITH_HEAD_ROT