Commit c108c658 authored by kinuthia's avatar kinuthia
Browse files

fix memory error for ISM with reverb enabled 

under FIX_197_CREND_INTERFACE_MEM_FIX define
parent 9f858d30

lib_com/ivas_prot.h

+5 −0
Original line number Diff line number Diff line
@@ -5447,7 +5447,12 @@ void ivas_rend_closeCrend( 
#else

ivas_error ivas_rend_closeCrend(

#endif

#ifdef FIX_197_CREND_INTERFACE_MEM_FIX

    CREND_WRAPPER_HANDLE *pCrend,

    RENDERER_TYPE *renderer_type );

    #else

    CREND_WRAPPER_HANDLE *pCrend );

#endif



ivas_error ivas_rend_crendProcess(

    const CREND_WRAPPER *pCrend,

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ 


#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */



#define FIX_197_CREND_INTERFACE_MEM_FIX                 /* Eri: Memory error fix for ISM with reverb */





/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1707,7 +1707,11 @@ void ivas_destroy_dec( 


    /* Crend handle */

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_197_CREND_INTERFACE_MEM_FIX

    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

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


            /* close the crend binaural renderer */

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_197_CREND_INTERFACE_MEM_FIX

            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

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

            {

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_197_CREND_INTERFACE_MEM_FIX

                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