Commit afdf23ef authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

remove code to add zero to the delay

parent ecdd7c1f
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ int32_t get_delay(
    HANDLE_CLDFB_FILTER_BANK hCldfb,  /* i  : Handle of Cldfb analysis            */
    RENDERER_TYPE renderer_type,      /* i  : IVAS rendering type                 */
    const int32_t binaural_latency_ns /* i  : binaural renderer HRTF delay in ns  */      
#ifdef DFT_STEREO_SPAR_MIXING
    ,
    const int16_t sba_dirac_stereo_flag
#endif
)
{
    int32_t delay = 0;
@@ -103,12 +99,6 @@ int32_t get_delay(
            {
                delay += IVAS_FB_DEC_DELAY_NS;
            }
#ifdef DFT_STEREO_SPAR_MIXING
            else if ( sba_dirac_stereo_flag )
            {
                delay += 0;
            }
#endif

            /* compensate for Binaural renderer HRTF delay */
            {
+0 −4
Original line number Diff line number Diff line
@@ -719,10 +719,6 @@ int32_t get_delay(
    HANDLE_CLDFB_FILTER_BANK hCldfb,  /* i  : Handle of Cldfb analysis              */
    RENDERER_TYPE renderer_type,      /* i  : IVAS rendering type                   */
    const int32_t binaural_latency_ns /* i  : binaural renderer HRTF delay in ns    */
#ifdef DFT_STEREO_SPAR_MIXING
    ,
    const int16_t sba_dirac_stereo_flag
#endif
);

void decision_matrix_enc(
+0 −4
Original line number Diff line number Diff line
@@ -1055,11 +1055,7 @@ ivas_error IVAS_DEC_GetDelay(
    st_ivas = hIvasDec->st_ivas;
    hDecoderConfig = st_ivas->hDecoderConfig;

#ifdef DFT_STEREO_SPAR_MIXING
    *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, st_ivas->sba_dirac_stereo_flag ) );
#else
    *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 ) );
#endif

    *timeScale = hDecoderConfig->output_Fs;

+0 −4
Original line number Diff line number Diff line
@@ -951,11 +951,7 @@ ivas_error IVAS_ENC_GetDelay(
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;
    }

#ifdef DFT_STEREO_SPAR_MIXING
    *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, RENDERER_DISABLE, 0, 0 ) );
#else
    *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, RENDERER_DISABLE, 0 ) );
#endif

    *delay *= hEncoderConfig->nchan_inp;