Commit f20b379c authored by Jan Kiene's avatar Jan Kiene
Browse files

do not allocate PLCinfo struct in IVAS modes

parent 5163331a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define FIX_I173_I174                                   /* Issues 173 and 174: Remove frame and subframe index from ISm metadata and headtracking respectively. */

#define FIX_TCX_DEC_RECONF_BFI

#define FIX_SBA_DTX_DECODE_ERROR                        /* Issue 176: SBA decoder error with DTX at 80kbps SWB, Issue 21: SBA front-VAD threshold (203) */

#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS              /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */



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

/* clang-format on */

lib_dec/init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -661,7 +661,11 @@ ivas_error init_decoder( 
     * Mode 2 initialization

     *-----------------------------------------------------------------*/



#ifdef FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS

    if ( st->element_mode == EVS_MONO )

#else

    if ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT )

#endif

    {

        if ( ( st->hPlcInfo = (T_PLCInfo_HANDLE) count_malloc( sizeof( T_PLCInfo ) ) ) == NULL )

        {