Commit 34e0520b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_103_RA_PARAMS_PARAM_BIN_REND

parent 4c573b12

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ 
#endif

#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_103_RA_PARAMS_PARAM_BIN_REND                /* Issue 103: Digest room acoustics parameters for Parametric Binaural Renderer*/

/*#define SBA_HPF_TUNING_DEC*/



#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */

lib_rend/ivas_reverb.c

+0 −23
Original line number Diff line number Diff line
@@ -1895,7 +1895,6 @@ ivas_error ivas_binaural_reverb_open( 
    }





#ifdef FIX_103_RA_PARAMS_PARAM_BIN_REND

    if ( ( roomAcoustics ) && ( roomAcoustics->override ) )

    {

        ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfFastConv, output_config, roomAcoustics->use_brir, sampling_rate, t60, ene );
@@ -1915,28 +1914,6 @@ ivas_error ivas_binaural_reverb_open( 
            ivas_binaural_reverb_setPreDelay( hReverb, 10 );

        }

    }

#else

    if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

    {

        if ( !roomAcoustics->override )

        {

            ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfFastConv->fastconvReverberationTimes, hHrtfFastConv->fastconvReverberationEneCorrections );

            ivas_binaural_reverb_setPreDelay( hReverb, 10 );

        }

        else

        {

            ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfFastConv, output_config, roomAcoustics->use_brir, sampling_rate, t60, ene );

            ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, t60, ene );

            ivas_binaural_reverb_setPreDelay( hReverb, (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX ) );

        }

    }

    else

    {

        ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfParambin->parametricReverberationTimes, hHrtfParambin->parametricReverberationEneCorrections );

        ivas_binaural_reverb_setPreDelay( hReverb, 10 );

    }



#endif

    return IVAS_ERR_OK;

}