Commit 1aaeca2e authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 116-Bitrate-Switching-in-MC

parents 1b520586 f8397e59

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;

scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_utest_utils.c

+4 −1
Original line number Diff line number Diff line
@@ -1170,11 +1170,14 @@ ivas_result_t ivas_common_mixer_renderer( ivas_crend_io_params_t *pIo_params, fl 
    }

#endif

    /* test rounding error */

    float binaural_latencys_fastconv_s[3] = { FASTCONV_HRIR_latency_s, FASTCONV_BRIR_latency_s, FASTCONV_BRIR_latency_s };

    float binaural_latencys_fastconv_s[3];

    float binaural_latencys_crend_s[3] = { 1.f / 48000.f, 2.f / 48000.f, 3.f / 48000.f };

    float binaural_latencys_td_s[3] = { BINAURAL_TD_LATENCY_S, BINAURAL_TD_LATENCY_S + 1.f / 48000.f, BINAURAL_TD_LATENCY_S + 2.f / 48000.f };



    int32_t err = 0, err_lfe = 0, err_dec = 0;

    binaural_latencys_fastconv_s[0] = FASTCONV_HRIR_latency_s;

    binaural_latencys_fastconv_s[1] = FASTCONV_BRIR_latency_s;

    binaural_latencys_fastconv_s[2] = FASTCONV_BRIR_latency_s;

    err = ivas_check_rounding( binaural_latencys_fastconv_s, 0, 0, &err_lfe, &err_dec, 0 );

#ifdef FIX_I59_CREND

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

lib_com/prot.h

+5 −5

File changed.

Contains only whitespace changes.