Commit 18777421 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_569_TD_FILTER_LENGTH

parent 10a4d7cb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ 






#define FIX_569_TD_FILTER_LENGTH                        /* Eri: Issue 569: If an HRTF binary file exceeds the SFX_SPAT_BIN_MAX_FILTER_LENGTH the decoder crashes. This truncates the filter when generated from the model.  */



#define FIX_595_SHL_NOGLOB                              /* FhG: Issue 595: compilation with BASOP_NOGLOB disabled */

#define UPDATE_FASTCONV_SBA_FILTER                      /* Dlb: Issue 584: Update SBA CLDFB-Domain HRTFs */

lib_rend/ivas_objectRenderer_hrFilt.c

+0 −7
Original line number Diff line number Diff line
@@ -96,9 +96,7 @@ void GetFilterFromAngle( 
    TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure  */

    const float Elev,                     /* i  : Elevation, degrees       */

    float Azim,                           /* i  : Azimuth, degrees         */

#ifdef FIX_569_TD_FILTER_LENGTH

    const int16_t filterlength, /* i  : Filter length            */

#endif

    float *hrf_left,  /* o  : Left HR filter           */

    float *hrf_right, /* o  : Right HR filter          */

    int16_t *itd      /* o  : ITD value                */
@@ -107,13 +105,8 @@ void GetFilterFromAngle( 


    GenerateFilter( Elev, Azim, &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval );



#ifdef FIX_569_TD_FILTER_LENGTH

    mvr2r( HrFiltSet_p->ModelEval.hrfModL, hrf_left, filterlength );

    mvr2r( HrFiltSet_p->ModelEval.hrfModR, hrf_right, filterlength );

#else

    mvr2r( HrFiltSet_p->ModelEval.hrfModL, hrf_left, HrFiltSet_p->ModelParams.K );

    mvr2r( HrFiltSet_p->ModelEval.hrfModR, hrf_right, HrFiltSet_p->ModelParams.K );

#endif



    /* 4. Evaluate the ITD */

    if ( HrFiltSet_p->ModelParams.UseItdModel )

lib_rend/ivas_objectRenderer_sources.c

+0 −8
Original line number Diff line number Diff line
@@ -275,11 +275,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 
    Listener_p = hBinRendererTd->Listener_p;

    HrFiltSet_p = hBinRendererTd->HrFiltSet_p;



#ifdef FIX_569_TD_FILTER_LENGTH

    *filterlength = min( HrFiltSet_p->FiltLength, SFX_SPAT_BIN_MAX_FILTER_LENGTH );

#else

    *filterlength = HrFiltSet_p->FiltLength;

#endif



    if ( SrcSpatial_p->PosType == TDREND_POSTYPE_ABSOLUTE )

    {
@@ -301,11 +297,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 
        Azim = -1.0f * _180_OVER_PI * (float) atan2f( ListRelPos[1], ListRelPos[0] );

    }



#ifdef FIX_569_TD_FILTER_LENGTH

    GetFilterFromAngle( HrFiltSet_p, Elev, Azim, *filterlength, hrf_left, hrf_right, itd );

#else

        GetFilterFromAngle( HrFiltSet_p, Elev, Azim, hrf_left, hrf_right, itd );

#endif



    /* 6. Evaluate the directional and distance gains */

    /* Directional gain */

lib_rend/ivas_prot_rend.h

+0 −2
Original line number Diff line number Diff line
@@ -663,9 +663,7 @@ void GetFilterFromAngle( 
    TDREND_HRFILT_FiltSet_t *HrFiltSet_p,                       /* i/o: HR filter set structure                 */

    const float Elev,                                           /* i  : Elevation, degrees                      */

    float Azim,                                                 /* i  : Azimuth, degrees                        */

#ifdef FIX_569_TD_FILTER_LENGTH

    const int16_t filterlength,                                 /* i  : Filter length                           */

#endif

    float *LeftFilter,                                          /* o  : Left HR filter                          */

    float *RightFilter,                                         /* o  : Right HR filter                         */

    int16_t *itd                                                /* o  : ITD value                               */