Commit a752bfed authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch... 

Merge branch '1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution-cleanup' into '1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution'

Cleanup and consolidation of rendering configuration processing

See merge request !1754
parents 3251ba95 5a1884f8

apps/decoder.c

+13 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ int main( 
        }

    }



#ifndef FIX_1158_FASTCONV_REVERB_HRTF

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

     * Open renderer configuration reader file

     *------------------------------------------------------------------------------------------*/
@@ -419,6 +420,7 @@ int main( 
            goto cleanup;

        }

    }

#endif



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

     * Configure the decoder
@@ -606,6 +608,17 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_1158_FASTCONV_REVERB_HRTF

        IVAS_DEC_GetDefaultRenderConfig( &renderConfig );



        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );

            goto cleanup;

        }



#endif



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

        {

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