Commit 75345657 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

parent 7977fbe6

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ 
#define FIX_1521_SBA_LOUDNESS_STEREO                    /* FhG: issue 1521: Fix loudness for SBA to stereo rendering */

#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, synch with BASOP updates and adding clamping of distance att input and listener position  */

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

#define FIX_1571_BFI_COPY_ARRAY_CORRECT_LEN             /* FhG: issue 1571: use correct channel signal length for copying signal to buffer */

#define FIX_FLOAT_1573_POSITION_UPDATE                  /* Eri: Float issue 1573: For static orientation and listener movement, the PoseUpdated flag is cleared and prevents 5 ms update rate. */

#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

lib_rend/lib_rend.c

+0 −12
Original line number Diff line number Diff line
@@ -4112,13 +4112,8 @@ ivas_error IVAS_REND_AddInput( 
    setMaxGlobalDelayNs( hIvasRend );



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

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

    if ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )

#else

    if ( hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )

#endif

    {

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, getDefaultReverbSize( hIvasRend->inputsIsm,

                                                                                     hIvasRend->inputsMasa,

                                                                                     hIvasRend->inputsMc,
@@ -4126,13 +4121,6 @@ ivas_error IVAS_REND_AddInput( 
        {

            return error;

        }

#else

        IVAS_REND_SetReverbRoomSize( hIvasRend,

                                     getDefaultReverbSize( hIvasRend->inputsIsm,

                                                           hIvasRend->inputsMasa,

                                                           hIvasRend->inputsMc,

                                                           hIvasRend->inputsSba ) );

#endif

    }



    return IVAS_ERR_OK;