Commit c2f35ea1 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_310_TD_REND_DELAY

parent de8579d7

lib_com/ivas_cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -1412,9 +1412,6 @@ typedef enum 
#define MAX_ANGULAR_STEP                        (1.0f)

#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12

#ifndef FIX_310_TD_REND_DELAY

#define BINAURAL_TD_LATENCY_S                   0.0f                        /* ITD fix removes TD renderer delay -- should be cleaned out */

#endif



/* ----- Enums - TD Renderer ----- */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
#define FIX_197_CREND_INTERFACE 



#define FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

#define FIX_310_TD_REND_DELAY                           /* Adding HRTF delay being read from ROM/Binary file, fix rounding for delay compensation in renderer */

#define FIX_334_DEBUG_BE_STEREO_SWITCHING               /* FhG: Fix non-BE issue for stereo switching when DEBUGGING is enabled */

#define FIX_198_TDREND_INTERFACE                        /* Issue 198: Harmonize interface for TD renderer between decoder and external renderer */

lib_rend/ivas_hrtf.c

+0 −2
Original line number Diff line number Diff line
@@ -210,9 +210,7 @@ void DefaultBSplineModel( 


    HRTF_model_precalc( model );



#ifdef FIX_310_TD_REND_DELAY

    HrFiltSet_p->latency_s = orange53_rom_latency_s;

#endif

    HrFiltSet_p->SampleRate = output_Fs;

    HrFiltSet_p->FiltLength = HrFiltSet_p->ModelParams.K;

    BSplineModelEvalAlloc( &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval );

lib_rend/ivas_objectRenderer.c

+0 −12
Original line number Diff line number Diff line
@@ -295,18 +295,10 @@ ivas_error ivas_td_binaural_open( 


#ifdef FIX_198_TDREND_INTERFACE

    *hBinRendererTd = pBinRendTd;

#ifdef FIX_310_TD_REND_DELAY

    *binaural_latency_ns = (int32_t) ( ( *hBinRendererTd )->HrFiltSet_p->latency_s * 1000000000.f );

#else

    *binaural_latency_ns = (int32_t) ( BINAURAL_TD_LATENCY_S * 1000000000.f );

#endif

#else

    st_ivas->hBinRendererTd = hBinRendererTd;

#ifdef FIX_310_TD_REND_DELAY

    st_ivas->binaural_latency_ns = (int32_t) ( hBinRendererTd->HrFiltSet_p->latency_s * 1000000000.f );

#else

    st_ivas->binaural_latency_ns = (int32_t) ( BINAURAL_TD_LATENCY_S * 1000000000.f );

#endif

#endif



    return error;
@@ -857,11 +849,7 @@ ivas_error ivas_rend_TDObjRendOpen( 


    pTDRend->hBinRendererTd = hBinRendererTd;



#ifdef FIX_310_TD_REND_DELAY

    pTDRend->binaural_latency_ns = (int32_t) ( hBinRendererTd->HrFiltSet_p->latency_s * 1000000000.f );

#else

    pTDRend->binaural_latency_ns = (int32_t) ( BINAURAL_TD_LATENCY_S * 1000000000.f );

#endif



    return IVAS_ERR_OK;

#endif

lib_rend/ivas_rom_TdBinauralRenderer.c

+0 −2
Original line number Diff line number Diff line
@@ -46,9 +46,7 @@ 
 * TD Binaural rendering related ROM tables

 *------------------------------------------------------------------------*/

/* TD renderer HRTF default model Orange53 */

#ifdef FIX_310_TD_REND_DELAY

const float orange53_rom_latency_s = 0.000020834f;

#endif

const int16_t orange53_rom_azimDim2[18] = { 

1, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 1, 

 };