Commit a55c9e62 authored by norvell's avatar norvell
Browse files

Resolve merge conflict with FIX_310_TD_REND_DELAY

parent ac0c44b2

lib_rend/ivas_objectRenderer.c

+6 −1
Original line number Diff line number Diff line
@@ -294,14 +294,19 @@ ivas_error ivas_td_binaural_open( 
    }



#ifdef FIX_198_TDREND_INTERFACE

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

    *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;