Commit 1d625806 authored by emerit's avatar emerit
Browse files

Refactor fix memory uninitialised with TD renderer

parent 173aa52e

lib_com/ivas_prot.h

+5 −5
Original line number Diff line number Diff line
@@ -5431,6 +5431,11 @@ ivas_error ivas_rend_initCrend( 
#endif

    const int32_t output_Fs );    



#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

ivas_error ivas_rend_initCrendWrapper(

    CREND_WRAPPER_HANDLE *pCrend );

#endif    



ivas_error ivas_rend_openCrend(

    CREND_WRAPPER_HANDLE *pCrend,

    const IVAS_REND_AudioConfig inConfig,
@@ -5447,12 +5452,7 @@ void ivas_rend_closeCrend( 
#else

ivas_error ivas_rend_closeCrend(

#endif

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

    CREND_WRAPPER_HANDLE *pCrend,

    RENDERER_TYPE *renderer_type );

#else

    CREND_WRAPPER_HANDLE *pCrend );

#endif



ivas_error ivas_rend_crendProcess(

    const CREND_WRAPPER *pCrend,

lib_dec/ivas_init_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -1177,11 +1177,15 @@ ivas_error ivas_init_decoder( 
        if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

        {

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

            if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK )

#else

            if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );

            }

            if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )

#endif

#else

            if ( ( st_ivas->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )

#endif
@@ -1707,11 +1711,7 @@ void ivas_destroy_dec( 


    /* Crend handle */

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

    ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), &st_ivas->renderer_type );

#else

    ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

#endif

#else

    ivas_crend_close( st_ivas );

#endif

lib_dec/ivas_ism_param_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1155,11 +1155,7 @@ static ivas_error ivas_ism_bitrate_switching( 


            /* close the crend binaural renderer */

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

            ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), &st_ivas->renderer_type );

#else

            ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

#endif

#else

            ivas_crend_close( st_ivas );

lib_dec/ivas_mct_dec.c

+8 −4
Original line number Diff line number Diff line
@@ -1041,11 +1041,7 @@ static ivas_error ivas_mc_dec_reconfig( 
#endif

            {

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

                ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), &st_ivas->renderer_type );

#else

                ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

#endif

#else

                ivas_crend_close( st_ivas );

#endif
@@ -1115,10 +1111,18 @@ static ivas_error ivas_mc_dec_reconfig( 
#ifdef FIX_197_CREND_INTERFACE

                if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

                {

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

                    if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK )

#else

                    if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )

#endif

                    {

                        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );

                    }

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

                    st_ivas->hCrendWrapper->hCrend = NULL;

                    st_ivas->hCrendWrapper->hHrtfCrend = NULL;

#endif

                    if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )

                    {

                        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" );

lib_dec/ivas_sba_dec.c

+8 −4
Original line number Diff line number Diff line
@@ -170,11 +170,7 @@ ivas_error ivas_sba_dec_reinit( 


    /* Crend handle */

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

    ivas_rend_closeCrend( &st_ivas->hCrendWrapper, &st_ivas->renderer_type );

#else

    ivas_rend_closeCrend( &st_ivas->hCrendWrapper );

#endif

#else

    ivas_crend_close( st_ivas );

#endif
@@ -478,10 +474,18 @@ ivas_error ivas_sba_dec_reinit( 
        if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

        {

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

            if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK )

#else

            if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )

#endif

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CrendWrapper\n" );

            }

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

            st_ivas->hCrendWrapper->hCrend = NULL;

            st_ivas->hCrendWrapper->hHrtfCrend = NULL;

#endif

            if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )

#else

            if ( ( st_ivas->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )