Commit 15819112 authored by janssontoftg's avatar janssontoftg
Browse files

Merge remote-tracking branch 'remotes/origin/main' into...

Merge remote-tracking branch 'remotes/origin/main' into 310-rendering-add-latency_s-value-to-td-object-renderer-tables
parents d090e9de b152af5f
Loading
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -694,17 +694,29 @@ ivas_error ivas_binRenderer_open(
        {
            if ( hBinRenderer->ivas_format == MC_FORMAT )
            {
#ifdef HRTF_BINARY_FILE
                st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HRIR_latency_s * 1000000000.f );
#else
                st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_HRIR_latency_s * 1000000000.f );
#endif
            }
            else
            {
#ifdef HRTF_BINARY_FILE
                st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );
#else
                st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f );
#endif
            }
        }
        else
        {
            /* same value for MC or HOA both use MC BRIR*/
#ifdef HRTF_BINARY_FILE
            st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_BRIR_latency_s * 1000000000.f );
#else
            st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_BRIR_latency_s * 1000000000.f );
#endif
        }
#else
        if ( hBinRenderer->ivas_format == MC_FORMAT )