Commit 1fdd23c4 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix float issue 1569 by adding proper error checks. Also fix inverted condition.

parent 496d928d

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ int main( 
    /* Set reverb room size if specified */

    if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO )

    {

        if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError setting reverb room size\n" );

            goto cleanup;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
#define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */

#define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN      /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */

#define FIX_2495_Q_ALIGN_OSBA_RENDERER                  /* FhG: Basop issue #2495: Corrected exponent scaling of outAudio.data_fx before buffer accumulation in renderSbaToBinaural(). */

#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */



/* ##################### End NON-BE switches ########################### */

lib_rend/lib_rend_fx.c

+15 −0
Original line number Diff line number Diff line
@@ -4795,11 +4795,22 @@ ivas_error IVAS_REND_AddInput_fx( 
    /* select default reverb size after adding an input */

    IF( EQ_32( hIvasRend->selectedRoomReverbSize, DEFAULT_REVERB_UNSET ) )

    {

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

        IF( NE_32( error = IVAS_REND_SetReverbRoomSize( hIvasRend, getDefaultReverbSize( hIvasRend->inputsIsm,

                                                                                         hIvasRend->inputsMasa,

                                                                                         hIvasRend->inputsMc,

                                                                                         hIvasRend->inputsSba ) ),

                   IVAS_ERR_OK ) )

        {

            return error;

        }

#else

        IVAS_REND_SetReverbRoomSize( hIvasRend,

                                     getDefaultReverbSize( hIvasRend->inputsIsm,

                                                           hIvasRend->inputsMasa,

                                                           hIvasRend->inputsMc,

                                                           hIvasRend->inputsSba ) );

#endif

    }



    return IVAS_ERR_OK;
@@ -6078,7 +6089,11 @@ ivas_error IVAS_REND_SetReverbRoomSize( 


    IF( hIvasRend->hRendererConfig != NULL )

    {

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

        IF( NE_32( error = ivas_render_config_change_defaults( hIvasRend->hRendererConfig, hIvasRend->selectedRoomReverbSize ), IVAS_ERR_OK ) )

#else

        IF( EQ_32( error = ivas_render_config_change_defaults( hIvasRend->hRendererConfig, hIvasRend->selectedRoomReverbSize ), IVAS_ERR_OK ) )

#endif

        {

            return error;

        }