Commit ea0dc612 authored by janssontoftg's avatar janssontoftg
Browse files

Removed filterbank delay from binaural_latency_ns.

parent 95170560

lib_com/delay_comp.c

+7 −7
Original line number Diff line number Diff line
@@ -57,8 +57,10 @@ float get_delay( 
    HANDLE_CLDFB_FILTER_BANK hCldfb,  /* i  : Handle of Cldfb analysis            */

#ifndef FIX_I59

    RENDERER_TYPE renderer_type,      /* i  : IVAS rendering type                 */

#endif

    const int32_t binaural_latency_ns /* i  : binaural renderer HRTF delay in ns  */

#else

    const int32_t binaural_latency_ns /* i  : binauralization delay in ns         */

#endif

)

{

    float delay = 0;
@@ -97,16 +99,14 @@ float get_delay( 
        {

            delay = IVAS_DEC_DELAY_NS;

#ifdef FIX_I59

            if ( binaural_latency_ns > 0 )

            {

                /* compensate for binaural renderer delay */

                delay += binaural_latency_ns;

            }

            else if ( hCldfb != NULL )

            if ( hCldfb != NULL )

            {

                /* compensate for filterbank delay */

                delay += IVAS_FB_DEC_DELAY_NS;

            }



            /* compensate for binauralization delay */

            delay += binaural_latency_ns;

#else

            if ( hCldfb != NULL || renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

            {

lib_com/prot.h

+3 −1
Original line number Diff line number Diff line
@@ -719,8 +719,10 @@ float get_delay( 
    HANDLE_CLDFB_FILTER_BANK hCldfb,  /* i  : Handle of Cldfb analysis        */

#ifndef FIX_I59

    RENDERER_TYPE renderer_type,      /* i  : IVAS rendering type                 */

#endif

    const int32_t binaural_latency_ns /* i  : binaural renderer HRTF delay in ns  */

#else

    const int32_t binaural_latency_ns /* i  : binauralization delay in ns         */

#endif

);



void decision_matrix_enc(

lib_dec/ivas_init_dec.c

+10 −1
Original line number Diff line number Diff line
@@ -619,6 +619,9 @@ ivas_error ivas_init_decoder( 
    AUDIO_CONFIG output_config;

    DECODER_CONFIG_HANDLE hDecoderConfig;

    ivas_error error;

#ifdef FIX_I59

    int32_t lfe_delay;

#endif



    error = IVAS_ERR_OK;
@@ -1278,7 +1281,13 @@ ivas_error ivas_init_decoder( 
    if ( st_ivas->mc_mode == MC_MODE_MCT )

    {

#ifdef FIX_I59

        if ( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, output_Fs, st_ivas->binaural_latency_ns ) ) != IVAS_ERR_OK )

        lfe_delay = st_ivas->binaural_latency_ns;

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

        {

            /* Account for filterbank delay */

            lfe_delay += IVAS_FB_DEC_DELAY_NS;

        }

        if ( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, output_Fs, lfe_delay ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, output_Fs, st_ivas->hHrtf != NULL ? st_ivas->hHrtf->latency_s : 0 ) ) != IVAS_ERR_OK )

#endif

lib_dec/ivas_stat_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -2005,7 +2005,7 @@ typedef struct Decoder_Struct 
    HEAD_TRACK_DATA_HANDLE hHeadTrackData;                     /* Head tracking data structure */

    RENDER_CONFIG_DATA *hRenderConfig;                         /* Renderer config pointer */

#ifdef FIX_I59

    int32_t binaural_latency_ns;                               /* Binaural renderer latency in ns */

    int32_t binaural_latency_ns;                               /* Binauralization latency in ns */

#else

    int32_t binaural_latency_ns;                               /* HRTF binauralization latency in ns */

#endif