Commit 6f178116 authored by janssontoftg's avatar janssontoftg
Browse files

Using roundf() instead of NS2SA for nanosec to sample conversion to get rounding in sample domain.

parent adc274ab

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1056,13 +1056,13 @@ ivas_error IVAS_DEC_GetDelay( 
    hDecoderConfig = st_ivas->hDecoderConfig;

#ifdef FIX_I59_LFE_TD_DELAY

#ifdef FIX_I59_DELAY_ROUNDING

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

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

#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 ) );

#endif

#else

#ifdef FIX_I59_DELAY_ROUNDING

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

    *nSamples = (int16_t) roundf( get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->renderer_type, 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->renderer_type, st_ivas->binaural_latency_ns ) + 0.5f ) );

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static ivas_result_t ivas_crend_binaural_test( ivas_crend_io_params_t *pIo_param 
    {

        ivas_wav_header_skip( pIo_params->fRef );

#ifdef FIX_FIX_I59

        skip_samples = NS2SA( pIo_params->sample_rate, (float) Io_params->latency_ns + 0.5f );

        skip_samples = (int32_t) roundf( (float) pIo_params->latency_ns * pIo_params->sample_rate / 1000000000.f );

#else

        skip_samples = (int32_t) ( pIo_params->latency_s * pIo_params->sample_rate );

#endif
@@ -503,7 +503,7 @@ static ivas_result_t ivas_crend_binaural_test( ivas_crend_io_params_t *pIo_param 
        AudioFileReader_open( &fRef, pIo_params->ref_path, pIo_params->sample_rate );



#ifdef FIX_FIX_I59

        skip_samples = NS2SA( pIo_params->sample_rate, (float) pIo_params->latency_ns + 0.5f );

        skip_samples = (int32_t) roundf( (float) pIo_params->latency_ns * pIo_params->sample_rate / 1000000000.f );

#else

        skip_samples = (int32_t) ( pIo_params->latency_s * pIo_params->sample_rate );

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -1506,7 +1506,7 @@ ivas_result_t ivas_common_mixer_renderer( ivas_crend_io_params_t *pIo_params, fl 
    if ( ( pIo_params->out_fmt == BIN_2 ) && ( pIo_params->no_delay_cmp == 0 ) )

    {

#ifdef FIX_FIX_I59

        skip_samples = NS2SA( pIo_params->sample_rate, (float) pIo_params->latency_ns + 0.5f );

        skip_samples = (int32_t) roundf( (float) pIo_params->latency_ns * pIo_params->sample_rate / 1000000000.f );

#else

        skip_samples = NS2SA( pIo_params->sample_rate, (int32_t) ( pIo_params->latency_s * 1000000000.f ) );

#endif