Commit 1c303ad8 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Addressing compiler errors

parent cd0a7f0a

lib_dec/lib_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -2149,23 +2149,23 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
    }



    /* CREND Jot reverberator */

    if ( hIvasDec->st_ivas->hCrendWrapper != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend->hReverb != NULL )

    if ( hIvasDec->st_ivas->hCrendWrapper != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend != NULL && ( hIvasDec->st_ivas->hCrendWrapper->hCrend )->hReverb != NULL )

    {

        ivas_reverb_init( &hIvasDec->st_ivas->hCrendWrapper->hCrend->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs );

        ivas_reverb_init( &( hIvasDec->st_ivas->hCrendWrapper->hCrend )->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs );

    }



    /* DirAC CLDFB reverberator */

    if ( hIvasDec->st_ivas->hDiracDecBin != NULL && hIvasDec->st_ivas->hDiracDecBin->hReverb != NULL )

    {

        ivas_binaural_reverb_close( &( hIvasDec->st_ivas->hDiracDecBin->hReverb ) );

        ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hDiracDecBin->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL );

        ivas_binaural_reverb_close( &( hIvasDec->st_ivas->hDiracDecBin )->hReverb );

        ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hDiracDecBin )->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL );

    }



    /* Fastconv CLDFB reverberator */

    if ( hIvasDec->st_ivas->hBinRenderer != NULL && hIvasDec->st_ivas->hBinRenderer->hReverb != NULL )

    {

        ivas_binaural_reverb_close( &( hIvasDec->st_ivas->hBinRenderer->hReverb ) );

        ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hBinRenderer->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hBinRenderer->conv_band, hIvasDec->st_ivas->hBinRenderer->timeSlots, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL );

        ivas_binaural_reverb_close( &( hIvasDec->st_ivas->hBinRenderer )->hReverb );

        ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hBinRenderer )->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hBinRenderer->conv_band, hIvasDec->st_ivas->hBinRenderer->timeSlots, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL );

    }

#endif