Commit f8397e59 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '59-delay-misalignment-of-lfe-in-binaural-rendering-with-td-object-renderer' into 'main'

"Delay misalignment of LFE in binaural rendering with TD object renderer" - reintroduce FIX_GET_DELAY_RETURN

See merge request !345
parents 380617dc 53ff07d8

lib_com/delay_comp.c

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ int32_t get_delay( 
        else /* IVAS */

        {

            delay = IVAS_DEC_DELAY_NS;



#ifdef FIX_I59_LFE_TD_DELAY

            if ( hCldfb != NULL )

            {

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1057,9 +1057,9 @@ ivas_error IVAS_DEC_GetDelay( 


#ifdef FIX_I59_LFE_TD_DELAY

#ifdef FIX_I59_DELAY_ROUNDING

    *nSamples = (int16_t) roundf( get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->binaural_latency_ns ) * ( hDecoderConfig->output_Fs / 1000000000.f ) );

    *nSamples = (int16_t) roundf( (float) get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->binaural_latency_ns ) * hDecoderConfig->output_Fs / 1000000000.f );

#else

    *nSamples = NS2SA( hDecoderConfig->output_Fs, (int32_t) ( get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->binaural_latency_ns ) + 0.5f ) );

    *nSamples = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->binaural_latency_ns ) );

#endif

#else

#ifdef FIX_I59_DELAY_ROUNDING

lib_enc/lib_enc.c

+1 −9
Original line number Diff line number Diff line
@@ -952,17 +952,9 @@ ivas_error IVAS_ENC_GetDelay( 
    }



#ifdef FIX_I59_LFE_TD_DELAY

#ifdef FIX_I59_DELAY_ROUNDING

    *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, 0 ) + 0.5f );

#else

    *delay = NS2SA( hEncoderConfig->input_Fs, (int32_t) ( get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, 0 ) + 0.5f ) );

#endif

#else

#ifdef FIX_I59_DELAY_ROUNDING

    *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, RENDERER_DISABLE, 0 ) + 0.5f );

    *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, 0 ) );

#else

    *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, RENDERER_DISABLE, 0 ) );

#endif

#endif



    *delay *= hEncoderConfig->nchan_inp;

lib_com/prot.h

+5 −5

File changed.

Contains only whitespace changes.