Commit dc691d23 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

parent 34a235dc

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ 
#define FIX_2500_RENDCONF_REFACTOR                      /* Eri: Basop issue #2500: Renderer configuration range check before conversion to fixed point. Harmonize between BASOP/float */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, adding clamping of distance att input and listener position */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX  /* Eri: Bug discovered in cleanup of basop issue 2023 */

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

#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG        /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */

#define FIX_BASOP_2524_MASA_REDUCE_META_BUG             /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */

#define FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX           /* Nokia: BASOP issue 2520: Fix wrong threshold in ParamBin */

lib_rend/lib_rend_fx.c

+0 −16
Original line number Diff line number Diff line
@@ -4840,14 +4840,9 @@ ivas_error IVAS_REND_AddInput_fx( 
    setMaxGlobalDelayNs( hIvasRend );



    /* select default reverb size after adding an input */

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

    test();

    IF( EQ_32( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) && EQ_32( hIvasRend->selectedRoomReverbSize, DEFAULT_REVERB_UNSET ) )

#else

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

#endif

    {

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

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

                                                                                         hIvasRend->inputsMasa,

                                                                                         hIvasRend->inputsMc,
@@ -4856,13 +4851,6 @@ ivas_error IVAS_REND_AddInput_fx( 
        {

            return error;

        }

#else

        IVAS_REND_SetReverbRoomSize( hIvasRend,

                                     getDefaultReverbSize( hIvasRend->inputsIsm,

                                                           hIvasRend->inputsMasa,

                                                           hIvasRend->inputsMc,

                                                           hIvasRend->inputsSba ) );

#endif

    }



    return IVAS_ERR_OK;
@@ -6149,11 +6137,7 @@ 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;

        }